sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-27 22:50:26 +03:00
Code

winbind: adapt the new reject constants also there

Browse Source 
Please note: in the past the value "0" was misinterpreted as other error. This
isn't true. "0" means no error.
Therefore a solution for this one has to found.
This commit is contained in:
Matthias Dieter Wallnöfer 2009-10-08 10:57:51 +02:00
parent efaa98e824
commit 1e2f455b4a
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
nsswitch/libwbclient/wbclient.h
View File

@ -427,10 +427,15 @@ struct wbcUserPasswordPolicyInfo {
**/
enum wbcPasswordChangeRejectReason {
WBC_PWD_CHANGE_REJECT_OTHER=0,
WBC_PWD_CHANGE_REJECT_TOO_SHORT=1,
WBC_PWD_CHANGE_REJECT_IN_HISTORY=2,
WBC_PWD_CHANGE_REJECT_COMPLEXITY=5
WBC_PWD_CHANGE_NO_ERROR=0,
WBC_PWD_CHANGE_PASSWORD_TOO_SHORT=1,
WBC_PWD_CHANGE_PWD_IN_HISTORY=2,
WBC_PWD_CHANGE_USERNAME_IN_PASSWORD=3,
WBC_PWD_CHANGE_FULLNAME_IN_PASSWORD=4,
WBC_PWD_CHANGE_NOT_COMPLEX=5,
WBC_PWD_CHANGE_MACHINE_NOT_DEFAULT=6,
WBC_PWD_CHANGE_FAILED_BY_FILTER=7,
WBC_PWD_CHANGE_PASSWORD_TOO_LONG=8
};
/**

8
nsswitch/pam_winbind.c
View File

@ -1862,22 +1862,22 @@ static int winbind_chauthtok_request(struct pwb_context *ctx,
switch (reject_reason) {
case -1:
break;
case WBC_PWD_CHANGE_REJECT_OTHER:
case WBC_PWD_CHANGE_NO_ERROR:
if ((min_pwd_age > 0) &&
(pwd_last_set + min_pwd_age > time(NULL))) {
PAM_WB_REMARK_DIRECT(ctx,
"NT_STATUS_PWD_TOO_RECENT");
}
break;
case WBC_PWD_CHANGE_REJECT_TOO_SHORT:
case WBC_PWD_CHANGE_PASSWORD_TOO_SHORT:
PAM_WB_REMARK_DIRECT(ctx,
"NT_STATUS_PWD_TOO_SHORT");
break;
case WBC_PWD_CHANGE_REJECT_IN_HISTORY:
case WBC_PWD_CHANGE_PWD_IN_HISTORY:
PAM_WB_REMARK_DIRECT(ctx,
"NT_STATUS_PWD_HISTORY_CONFLICT");
break;
case WBC_PWD_CHANGE_REJECT_COMPLEXITY:
case WBC_PWD_CHANGE_NOT_COMPLEX:
_make_remark(ctx, PAM_ERROR_MSG,
_("Password does not meet "
"complexity requirements"));