sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-23 17:34:34 +03:00
Code

r13391: Only fall into password change when ACB_PWNOEXP is not set

Browse Source 
(got it wrong the first time as administrator has this flag set by
default).

Guenther
(This used to be commit e9ccebf45a)
This commit is contained in:
Günther Deschner 2006-02-08 11:57:38 +00:00 committed by Gerald (Jerry) Carter
parent 7fc2c0befb
commit d5c5c856ae
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source3/nsswitch/pam_winbind.c
View File

@ -419,7 +419,7 @@ static int winbind_auth_request(pam_handle_t * pamh,
/* handle the case where the auth was ok, but the password must expire right now */
/* good catch from Ralf Haferkamp: an expiry of "never" is translated to -1 */
if ((response.data.auth.info3.user_rid != DOMAIN_USER_RID_ADMIN ) &&
if ( ! (response.data.auth.info3.acct_flags & ACB_PWNOEXP) &&
(response.data.auth.policy.expire > 0) &&
(response.data.auth.info3.pass_last_set_time + response.data.auth.policy.expire < time(NULL))) {
@ -436,7 +436,7 @@ static int winbind_auth_request(pam_handle_t * pamh,
}
/* warn a user if the password is about to expire soon */
if ((response.data.auth.info3.user_rid != DOMAIN_USER_RID_ADMIN ) &&
if ( ! (response.data.auth.info3.acct_flags & ACB_PWNOEXP) &&
(response.data.auth.policy.expire) &&
(response.data.auth.info3.pass_last_set_time + response.data.auth.policy.expire > time(NULL) ) ) {