diff options
| author | Günther Deschner <gd@samba.org> | 2008-12-04 18:21:10 +0100 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2008-12-12 12:31:00 +0100 |
| commit | 57b60c78a209a4e4769c2128b25da331b5843fc1 (patch) | |
| tree | 0464ccda730d0cbe3d2618c0f66a980295b9cf19 | |
| parent | be88e942c14950d1ee3400c0deff6d6b0011a848 (diff) | |
| download | samba-57b60c78a209a4e4769c2128b25da331b5843fc1.tar.gz | |
s3-samr: fix samr callers of samr_UserInfo18.
Guenther
(cherry picked from commit 1cbbda7adcd6a5558fa259261c527aff6fc82477)
| -rw-r--r-- | source/include/proto.h | 3 | ||||
| -rw-r--r-- | source/rpc_client/init_samr.c | 4 | ||||
| -rw-r--r-- | source/rpc_server/srv_samr_nt.c | 6 |
3 files changed, 9 insertions, 4 deletions
diff --git a/source/include/proto.h b/source/include/proto.h index 9802371fcd7..7cc1adcdc75 100644 --- a/source/include/proto.h +++ b/source/include/proto.h @@ -7423,7 +7423,8 @@ void init_samr_user_info16(struct samr_UserInfo16 *r, uint32_t acct_flags); void init_samr_user_info18(struct samr_UserInfo18 *r, const uint8 lm_pwd[16], - const uint8 nt_pwd[16]); + const uint8 nt_pwd[16], + uint8_t password_expired); void init_samr_user_info20(struct samr_UserInfo20 *r, struct lsa_BinaryString *parameters); void init_samr_user_info21(struct samr_UserInfo21 *r, diff --git a/source/rpc_client/init_samr.c b/source/rpc_client/init_samr.c index 2abe625faf6..68ecba0b16a 100644 --- a/source/rpc_client/init_samr.c +++ b/source/rpc_client/init_samr.c @@ -340,7 +340,8 @@ void init_samr_user_info16(struct samr_UserInfo16 *r, void init_samr_user_info18(struct samr_UserInfo18 *r, const uint8 lm_pwd[16], - const uint8 nt_pwd[16]) + const uint8 nt_pwd[16], + uint8_t password_expired) { DEBUG(5, ("init_samr_user_info18\n")); @@ -348,6 +349,7 @@ void init_samr_user_info18(struct samr_UserInfo18 *r, memcpy(r->lm_pwd.hash, lm_pwd, sizeof(r->lm_pwd.hash)) ? true : false; r->nt_pwd_active = memcpy(r->nt_pwd.hash, nt_pwd, sizeof(r->nt_pwd.hash)) ? true : false; + r->password_expired = password_expired; } /******************************************************************* diff --git a/source/rpc_server/srv_samr_nt.c b/source/rpc_server/srv_samr_nt.c index 4f7b44a782c..9c00486c589 100644 --- a/source/rpc_server/srv_samr_nt.c +++ b/source/rpc_server/srv_samr_nt.c @@ -2487,8 +2487,10 @@ static NTSTATUS get_user_info_18(pipes_struct *p, return NT_STATUS_ACCOUNT_DISABLED; } - init_samr_user_info18(r, pdb_get_lanman_passwd(smbpass), - pdb_get_nt_passwd(smbpass)); + init_samr_user_info18(r, + pdb_get_lanman_passwd(smbpass), + pdb_get_nt_passwd(smbpass), + 0 /* FIXME */); TALLOC_FREE(smbpass); |