diff options
| author | Günther Deschner <gd@samba.org> | 2008-12-04 18:15:03 +0100 |
|---|---|---|
| committer | Günther Deschner <gd@samba.org> | 2008-12-05 14:27:03 +0100 |
| commit | 7423b6a4b8aadd12fde2f348d8637099b4171848 (patch) | |
| tree | aa639efe0bcd8e0132ada20b673a0df85c2f87dd | |
| parent | ce0116815852ddf261954c6df89039ebee24aa87 (diff) | |
| download | samba-7423b6a4b8aadd12fde2f348d8637099b4171848.tar.gz samba-7423b6a4b8aadd12fde2f348d8637099b4171848.tar.bz2 samba-7423b6a4b8aadd12fde2f348d8637099b4171848.zip | |
s3-samr: fix SAMR_FIELD_PASSWORD callers.
Guenther
| -rw-r--r-- | source3/lib/netapi/user.c | 2 | ||||
| -rw-r--r-- | source3/rpc_server/srv_samr_nt.c | 4 | ||||
| -rw-r--r-- | source3/utils/net_rpc.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/source3/lib/netapi/user.c b/source3/lib/netapi/user.c index 2e319cf23c..1f4b03f677 100644 --- a/source3/lib/netapi/user.c +++ b/source3/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/source3/rpc_server/srv_samr_nt.c b/source3/rpc_server/srv_samr_nt.c index f5e477f668..bff168bf2f 100644 --- a/source3/rpc_server/srv_samr_nt.c +++ b/source3/rpc_server/srv_samr_nt.c @@ -3856,8 +3856,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/source3/utils/net_rpc.c b/source3/utils/net_rpc.c index 0c34972a29..f69d3f9012 100644 --- a/source3/utils/net_rpc.c +++ b/source3/utils/net_rpc.c @@ -5251,7 +5251,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); |