diff --git a/debian/changelog b/debian/changelog index abb2a710..73a823b3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -17,6 +17,7 @@ shadow (1:4.1.3-1) unstable; urgency=low + debian/patches/300_SHA_crypt_method + debian/patches/301_manpages_missing_options + debian/patches/415_login_put-echoctl-back + + debian/patches/431_su_uid_0_not_root - Remove patches applied upstream (4.1.3): + debian/patches/200_Czech_binary_translation + debian/patches/302_remove_non_translated_polish_manpages diff --git a/debian/patches/431_su_uid_0_not_root b/debian/patches/431_su_uid_0_not_root deleted file mode 100644 index ba78c5a0..00000000 --- a/debian/patches/431_su_uid_0_not_root +++ /dev/null @@ -1,26 +0,0 @@ -Goal: don't assume uid 0 == "root", use getpwuid to fetch it -Fixes: #81924 - -Status wrt upstream: It was submitted upstream upstream (3 Jun 2005). - Some modification may be needed before its inclusion - upstream (multiple uid 0 accounts). -http://lists.alioth.debian.org/pipermail/pkg-shadow-devel/2005-June/001287.html - -Index: shadow-4.1.0/src/su.c -=================================================================== ---- shadow-4.1.0.orig/src/su.c -+++ shadow-4.1.0/src/su.c -@@ -449,7 +449,12 @@ - optind++; - } - if ('\0' == name[0]) { /* use default user ID */ -- (void) strcpy (name, "root"); -+ struct passwd *root_pw = getpwuid(0); -+ if (root_pw == NULL) { -+ SYSLOG((LOG_CRIT, "There is no UID 0 user.")); -+ su_failure(tty); -+ } -+ strcpy(name, root_pw->pw_name); - } - - doshell = argc == optind; /* any arguments remaining? */ diff --git a/debian/patches/series b/debian/patches/series index f1e6987c..d3ddfd45 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -3,7 +3,6 @@ #901_testsuite_gcov 503_shadowconfig.8 -431_su_uid_0_not_root 008_su_no_sanitize_env 008_su_get_PAM_username 428_grpck_add_prune_option