summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2001-10-01 13:07:46 +0000
committerAndrew Tridgell <tridge@samba.org>2001-10-01 13:07:46 +0000
commitcf2ec80d4e8733bbfd98d9737fa7e99712b72eb3 (patch)
treef35d4b6a42a7baa9b5ce49b68bfa9b81e9013d6b
parentc6d1e756649408412d72e5ad2789804b2908b6f2 (diff)
downloadsamba-cf2ec80d4e8733bbfd98d9737fa7e99712b72eb3.tar.gz
samba-cf2ec80d4e8733bbfd98d9737fa7e99712b72eb3.tar.bz2
samba-cf2ec80d4e8733bbfd98d9737fa7e99712b72eb3.zip
honor the ACB_PWNOEXP flag in smbpasswd
(This used to be commit 70b7c900c907c4620faa7d82845296298b3820ff)
-rw-r--r--source3/auth/auth_sam.c3
-rw-r--r--source3/smbd/auth_smbpasswd.c3
2 files changed, 2 insertions, 4 deletions
diff --git a/source3/auth/auth_sam.c b/source3/auth/auth_sam.c
index 304e5be44b..835ade739f 100644
--- a/source3/auth/auth_sam.c
+++ b/source3/auth/auth_sam.c
@@ -246,8 +246,7 @@ NTSTATUS sam_account_ok(SAM_ACCOUNT *sampass, const auth_usersupplied_info *user
SAFE_FREE(workstation_list);
}
-
- {
+ if (!(pdb_get_acct_ctrl(sampass) & ACB_PWNOEXP)) {
time_t must_change_time = pdb_get_pass_must_change_time(sampass);
time_t last_set_time = pdb_get_pass_last_set_time(sampass);
diff --git a/source3/smbd/auth_smbpasswd.c b/source3/smbd/auth_smbpasswd.c
index 304e5be44b..835ade739f 100644
--- a/source3/smbd/auth_smbpasswd.c
+++ b/source3/smbd/auth_smbpasswd.c
@@ -246,8 +246,7 @@ NTSTATUS sam_account_ok(SAM_ACCOUNT *sampass, const auth_usersupplied_info *user
SAFE_FREE(workstation_list);
}
-
- {
+ if (!(pdb_get_acct_ctrl(sampass) & ACB_PWNOEXP)) {
time_t must_change_time = pdb_get_pass_must_change_time(sampass);
time_t last_set_time = pdb_get_pass_last_set_time(sampass);