From 91bf681dc4b35b2609079cd6ea37f47be94c5e31 Mon Sep 17 00:00:00 2001 From: =?utf8?q?G=C3=BCnther=20Deschner?= Date: Thu, 4 Dec 2008 18:15:03 +0100 Subject: [PATCH] s3-samr: fix SAMR_FIELD_PASSWORD callers. Guenther (cherry picked from commit 2edf2cef9cb43a65ce8ee8e8a782d248856030dd) --- source/lib/netapi/user.c | 2 +- source/rpc_server/srv_samr_nt.c | 4 ++-- source/utils/net_rpc.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/source/lib/netapi/user.c b/source/lib/netapi/user.c index 2abc25d6813..d7fe392526c 100644 --- a/source/lib/netapi/user.c +++ b/source/lib/netapi/user.c @@ -46,7 +46,7 @@ static void convert_USER_INFO_X_to_samr_user_info21(struct USER_INFO_X *infoX, fields_present |= SAMR_FIELD_ACCOUNT_NAME; } if (infoX->usriX_password) { - fields_present |= SAMR_FIELD_PASSWORD; + fields_present |= SAMR_FIELD_NT_PASSWORD_PRESENT; } if (infoX->usriX_flags) { fields_present |= SAMR_FIELD_ACCT_FLAGS; diff --git a/source/rpc_server/srv_samr_nt.c b/source/rpc_server/srv_samr_nt.c index b34b47c2cf3..9e603df276e 100644 --- a/source/rpc_server/srv_samr_nt.c +++ b/source/rpc_server/srv_samr_nt.c @@ -3966,8 +3966,8 @@ static NTSTATUS set_user_info_23(TALLOC_CTX *mem_ctx, return NT_STATUS_ACCESS_DENIED; } - if ((id23->info.fields_present & SAMR_FIELD_PASSWORD) || - (id23->info.fields_present & SAMR_FIELD_PASSWORD2)) { + if ((id23->info.fields_present & SAMR_FIELD_NT_PASSWORD_PRESENT) || + (id23->info.fields_present & SAMR_FIELD_LM_PASSWORD_PRESENT)) { DEBUG(5, ("Attempting administrator password change (level 23) for user %s\n", pdb_get_username(pwd))); diff --git a/source/utils/net_rpc.c b/source/utils/net_rpc.c index bb63a57caa3..65e0a49d360 100644 --- a/source/utils/net_rpc.c +++ b/source/utils/net_rpc.c @@ -5255,7 +5255,7 @@ static NTSTATUS rpc_trustdom_add_internals(struct net_context *c, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, ¶meters, 0, 0, ACB_DOMTRUST, - SAMR_FIELD_ACCT_FLAGS | SAMR_FIELD_PASSWORD, + SAMR_FIELD_ACCT_FLAGS | SAMR_FIELD_NT_PASSWORD_PRESENT, hours, 0, 0, 0, 0, 0, 0, 0, &crypt_pwd); -- 2.11.4.GIT