diff options
| author | Jeremy Allison <jra@samba.org> | 2009-10-08 10:01:51 -0700 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2009-10-08 10:01:51 -0700 |
| commit | 77abc2dabd0477bf283793389da5add19aa42de1 (patch) | |
| tree | fee4af8e97dd736d6a4985182803059e928b746f /nsswitch/pam_winbind.c | |
| parent | 46d193324082000f19221f1b1ac679512aff96ed (diff) | |
| parent | fb7096a55bb7873965797feee72ceef2404d689d (diff) | |
| download | samba-77abc2dabd0477bf283793389da5add19aa42de1.tar.gz samba-77abc2dabd0477bf283793389da5add19aa42de1.tar.bz2 samba-77abc2dabd0477bf283793389da5add19aa42de1.zip | |
Merge branch 'master' of ssh://jra@git.samba.org/data/git/samba
Diffstat (limited to 'nsswitch/pam_winbind.c')
| -rw-r--r-- | nsswitch/pam_winbind.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/nsswitch/pam_winbind.c b/nsswitch/pam_winbind.c index 324bede9ea..654b4385d8 100644 --- a/nsswitch/pam_winbind.c +++ b/nsswitch/pam_winbind.c @@ -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")); |