diff options
| author | vorlon <Unknown> | 2007-08-19 10:59:24 +0000 |
|---|---|---|
| committer | vorlon <Unknown> | 2007-08-19 10:59:24 +0000 |
| commit | bdfd46104d22bbafaeb80171f9738afb9e9aaa01 (patch) | |
| tree | 10a66806cf6085ac450a697daed9d7f6d551fbc4 | |
| parent | d0cf197d7c34e2943dadcd0d150e551982428a89 (diff) | |
| download | pam-bdfd46104d22bbafaeb80171f9738afb9e9aaa01.tar.gz pam-bdfd46104d22bbafaeb80171f9738afb9e9aaa01.tar.bz2 pam-bdfd46104d22bbafaeb80171f9738afb9e9aaa01.zip | |
Refresh for the new upstream release
| -rw-r--r-- | patches-applied/021_nis_cleanup | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/patches-applied/021_nis_cleanup b/patches-applied/021_nis_cleanup index e313dc2e..f3345052 100644 --- a/patches-applied/021_nis_cleanup +++ b/patches-applied/021_nis_cleanup @@ -7,28 +7,28 @@ Index: Linux-PAM/modules/pam_unix/pam_unix_passwd.c =================================================================== --- Linux-PAM/modules/pam_unix/pam_unix_passwd.c.orig +++ Linux-PAM/modules/pam_unix/pam_unix_passwd.c -@@ -854,7 +854,7 @@ +@@ -1107,7 +1107,7 @@ if (_unix_blankpasswd(pamh, ctrl, user)) { return PAM_SUCCESS; - } else if (off(UNIX__IAMROOT, ctrl)) { + } else if (off(UNIX__IAMROOT, ctrl) || on(UNIX_NIS, ctrl)) { - /* instruct user what is happening */ - #define greeting "Changing password for " -@@ -872,7 +872,9 @@ + if (asprintf(&Announce, _("Changing password for %s."), + user) < 0) { +@@ -1120,7 +1120,9 @@ set(UNIX__OLD_PASSWD, lctrl); retval = _unix_read_password(pamh, lctrl ,Announce -- ,"(current) UNIX password: " -+ ,(on(UNIX__IAMROOT, ctrl) -+ ? "NIS server root password: " -+ : "(current) UNIX password: ") +- ,_("(current) UNIX password: ") ++ ,(on(UNIX__IAMROOT, ctrl) ++ ? _("NIS server root password: ") ++ : _("(current) UNIX password: ")) ,NULL ,_UNIX_OLD_AUTHTOK - ,(const char **) &pass_old); -@@ -883,9 +885,12 @@ - ,"password - (old) token not obtained"); + ,&pass_old); +@@ -1131,9 +1133,12 @@ + "password - (old) token not obtained"); return retval; } - /* verify that this is the password for this user */ |