honor the ACB_PWNOEXP flag in smbpasswd

diff --git a/source/auth/auth_sam.c b/source/auth/auth_sam.c
index 304e5be44bfebff55cb03b28008959b55154e9a7..835ade739fd58a4593a59c663dd1f4031c1ebf71 100644 (file)
--- a/source/auth/auth_sam.c
+++ b/source/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/source/smbd/auth_smbpasswd.c b/source/smbd/auth_smbpasswd.c
index 304e5be44bfebff55cb03b28008959b55154e9a7..835ade739fd58a4593a59c663dd1f4031c1ebf71 100644 (file)
--- a/source/smbd/auth_smbpasswd.c
+++ b/source/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);