From 5235e52b391f83d0334d6db064765e1c9079e0c9 Mon Sep 17 00:00:00 2001 From: Steve Langasek Date: Mon, 28 Jul 2008 13:44:19 -0700 Subject: drop the patch to restore the particular setreuid() handling, which was in fact buggy before and fixed now. --- debian/changelog | 3 --- .../pam_unix_setreuid_juggling.patch | 22 ---------------------- debian/patches-applied/series | 1 - 3 files changed, 26 deletions(-) delete mode 100644 debian/patches-applied/pam_unix_setreuid_juggling.patch (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 08dfcebf..80b58daa 100644 --- a/debian/changelog +++ b/debian/changelog @@ -32,9 +32,6 @@ pam (1.0.1-1) UNRELEASED; urgency=low * New patch pam_unix_thread-safe_save_old_password.patch, to make sure all our getpwnam() use in pam_unix is thread-safe (fixes an upstream regression) - * New patch pam_unix_setreuid_juggling.patch: restore the 0.99.9.0 - behavior wrt uid changes for NIS+, since I know the old behavior was - right and don't believe anyone has tested the new code. * New patch pam_unix_fix_sgid_shadow_auth.patch, fixing an upstream regression which prevents sgid shadow apps from being able to authenticate any more because the module forces use of the helper and the helper won't diff --git a/debian/patches-applied/pam_unix_setreuid_juggling.patch b/debian/patches-applied/pam_unix_setreuid_juggling.patch deleted file mode 100644 index 0605e108..00000000 --- a/debian/patches-applied/pam_unix_setreuid_juggling.patch +++ /dev/null @@ -1,22 +0,0 @@ -This particular setreuid() is only needed if we don't have any root -privs at all, so make it conditional like it was pre-1.0. - -Authors: Steve Langasek - -Upstream status: to be submitted - -Index: pam.deb/modules/pam_unix/passverify.c -=================================================================== ---- pam.deb.orig/modules/pam_unix/passverify.c -+++ pam.deb/modules/pam_unix/passverify.c -@@ -187,8 +187,8 @@ - if (save_uid == (*pwd)->pw_uid) - setreuid(save_uid, save_euid); - else { -- setreuid(-1, 0); -- setreuid(save_uid, -1); -+ if (setreuid(-1, 0) == -1) -+ setreuid(save_uid, -1); - setreuid(-1, save_euid); - } - diff --git a/debian/patches-applied/series b/debian/patches-applied/series index 3555e24b..9c85dc01 100644 --- a/debian/patches-applied/series +++ b/debian/patches-applied/series @@ -1,5 +1,4 @@ pam_unix_thread-safe_save_old_password.patch -pam_unix_setreuid_juggling.patch pam_unix_fix_sgid_shadow_auth.patch pam_unix_dont_trust_chkpwd_caller.patch 007_modules_pam_unix -- cgit v1.2.3