diff options
| author | vorlon <Unknown> | 2007-08-27 23:13:49 +0000 |
|---|---|---|
| committer | vorlon <Unknown> | 2007-08-27 23:13:49 +0000 |
| commit | 8ba2a82a79d01d314e74f46507d6ee9a455c7d0f (patch) | |
| tree | 0947ea995bd3b26823560bdc694175ab10870f9c | |
| parent | 1cc0dd3cfc830dffef0eae29cd5cc5efb2f80f72 (diff) | |
| download | pam-8ba2a82a79d01d314e74f46507d6ee9a455c7d0f.tar.gz pam-8ba2a82a79d01d314e74f46507d6ee9a455c7d0f.tar.bz2 pam-8ba2a82a79d01d314e74f46507d6ee9a455c7d0f.zip | |
Fix a couple of thinkos in hurd_no_setfsuid, that were preventing the code
from compiling on the Hurd still. Thanks to Michael Banck for the catch.
| -rw-r--r-- | changelog | 4 | ||||
| -rw-r--r-- | patches-applied/hurd_no_setfsuid | 6 |
2 files changed, 6 insertions, 4 deletions
@@ -14,8 +14,10 @@ pam (0.99.7.1-3) UNRELEASED; urgency=low * Create /etc/security/opasswd on new installs or on upgrades from 0.99.7.1-2 or below, so that users that enable the remember=<n> option to pam_unix aren't left unable to change passwords. Closes: #95324. + * Fix a couple of thinkos in hurd_no_setfsuid, that were preventing the code + from compiling on the Hurd still. Thanks to Michael Banck for the catch. - -- Steve Langasek <vorlon@debian.org> Mon, 27 Aug 2007 02:17:52 -0700 + -- Steve Langasek <vorlon@debian.org> Mon, 27 Aug 2007 16:12:05 -0700 pam (0.99.7.1-2) unstable; urgency=low diff --git a/patches-applied/hurd_no_setfsuid b/patches-applied/hurd_no_setfsuid index e80eaf83..1228fe86 100644 --- a/patches-applied/hurd_no_setfsuid +++ b/patches-applied/hurd_no_setfsuid @@ -22,7 +22,7 @@ Index: Linux-PAM/modules/pam_xauth/pam_xauth.c FILE *fp; int i; uid_t euid; -+#ifdef HAVE_SYS_FSUID_H ++#ifndef HAVE_SYS_FSUID_H + uid_t uid; +#endif /* Check this user's <sense> file. */ @@ -43,7 +43,7 @@ Index: Linux-PAM/modules/pam_xauth/pam_xauth.c + if (setreuid(-1, uid) == -1) { + setreuid(-1, 0); + setreuid(0, -1); -+ if (setreuid(-1, pwd->pw_uid) ++ if (setreuid(-1, pwd->pw_uid)) + return PAM_CRED_INSUFFICIENT; + } + } @@ -67,7 +67,7 @@ Index: Linux-PAM/modules/pam_xauth/pam_xauth.c int fd, i, debug = 0; int retval = PAM_SUCCESS; uid_t systemuser = 499, targetuser = 0, euid; -+#ifdef HAVE_SYS_FSUID_H ++#ifndef HAVE_SYS_FSUID_H + uid_t uid; +#endif |