summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2008-12-04 18:21:10 +0100
committerGünther Deschner <gd@samba.org>2008-12-05 14:27:03 +0100
commitb8204ffd03ccadf795978670e1c20247ab6aecc2 (patch)
tree3ab343c83010076a83765bd34b6833263f673f06 /source3
parent4bcf8edcf82d378686035e4ef451ca8ab777be4c (diff)
downloadsamba-b8204ffd03ccadf795978670e1c20247ab6aecc2.tar.gz
samba-b8204ffd03ccadf795978670e1c20247ab6aecc2.tar.bz2
samba-b8204ffd03ccadf795978670e1c20247ab6aecc2.zip
s3-samr: fix samr callers of samr_UserInfo18.
Guenther
Diffstat (limited to 'source3')
-rw-r--r--source3/include/proto.h3
-rw-r--r--source3/rpc_client/init_samr.c4
-rw-r--r--source3/rpc_server/srv_samr_nt.c6
3 files changed, 9 insertions, 4 deletions
diff --git a/source3/include/proto.h b/source3/include/proto.h
index 89b443e9db..f985fe25b7 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -5672,7 +5672,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/source3/rpc_client/init_samr.c b/source3/rpc_client/init_samr.c
index 7f48b1fdf9..a6e4ad8a33 100644
--- a/source3/rpc_client/init_samr.c
+++ b/source3/rpc_client/init_samr.c
@@ -341,7 +341,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"));
@@ -349,6 +350,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/source3/rpc_server/srv_samr_nt.c b/source3/rpc_server/srv_samr_nt.c
index bff168bf2f..54aa534311 100644
--- a/source3/rpc_server/srv_samr_nt.c
+++ b/source3/rpc_server/srv_samr_nt.c
@@ -2430,8 +2430,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);