[Pkg-shadow-commits] r445 - branches/experimental/debian/patches

[Christian Perrier]

Author: bubulle
Date: 2005-08-17 08:13:32 +0000 (Wed, 17 Aug 2005)
New Revision: 445

Modified:
   branches/experimental/debian/patches/437_su_add_GNU_options_1
   branches/experimental/debian/patches/series
Log:
Refresh 437 so that it applies in 4.0.12


Modified: branches/experimental/debian/patches/437_su_add_GNU_options_1
===================================================================
--- branches/experimental/debian/patches/437_su_add_GNU_options_1	2005-08-17 08:07:42 UTC (rev 444)
+++ branches/experimental/debian/patches/437_su_add_GNU_options_1	2005-08-17 08:13:32 UTC (rev 445)
@@ -5,19 +5,19 @@
       Broken:
        * additional_args is set, but not used.
        * !doshell is broken (argv is not incremented)
-Index: shadow-4.0.10/src/su.c
+Index: shadow-4.0.12/src/su.c
 ===================================================================
---- shadow-4.0.10.orig/src/su.c	2005-07-19 23:12:26.000000000 +0200
-+++ shadow-4.0.10/src/su.c	2005-07-19 23:43:57.000000000 +0200
-@@ -49,6 +49,7 @@
+--- shadow-4.0.12.orig/src/su.c	2005-08-17 10:10:19.000000000 +0200
++++ shadow-4.0.12/src/su.c	2005-08-17 10:13:00.000000000 +0200
+@@ -31,6 +31,7 @@
  
  #include "rcsid.h"
- RCSID (PKG_VER "$Id: su.c,v 1.39 2005/07/18 10:14:39 kloczek Exp $")
+ RCSID (PKG_VER "$Id: su.c,v 1.41 2005/08/04 19:13:43 kloczek Exp $")
 +#include <getopt.h>
  #include <grp.h>
  #include <pwd.h>
  #include <signal.h>
-@@ -79,6 +80,18 @@
+@@ -76,6 +77,18 @@
  
  /* local function prototypes */
  
@@ -36,7 +36,7 @@
  #ifndef USE_PAM
  
  static RETSIGTYPE die (int);
-@@ -263,6 +276,8 @@
+@@ -259,6 +272,8 @@
  	uid_t my_uid;
  	struct passwd *pw = 0;
  	char **envp = environ;
@@ -45,7 +45,7 @@
  
  #ifdef USE_PAM
  	int ret;
-@@ -283,6 +298,8 @@
+@@ -279,6 +294,8 @@
  	bindtextdomain (PACKAGE, LOCALEDIR);
  	textdomain (PACKAGE);
  
@@ -54,7 +54,7 @@
  	/*
  	 * Get the program name. The program name is used as a prefix to
  	 * most error messages.
-@@ -326,15 +343,56 @@
+@@ -322,15 +339,56 @@
  	 * Process the command line arguments. 
  	 */
  
@@ -116,7 +116,7 @@
  	/*
  	 * If a new login is being set up, the old environment will be
  	 * ignored and a new one created later on.
-@@ -369,29 +427,7 @@
+@@ -365,29 +423,7 @@
  			addenv (*envp++, NULL);
  	}
  
@@ -147,9 +147,9 @@
  
  	/*
  	 * Get the user's real name. The current UID is used to determine
-@@ -513,6 +549,23 @@
- 	if (pwent.pw_shell[0] == '\0')
- 		pwent.pw_shell = "/bin/sh";	/* XXX warning: const */
+@@ -624,6 +660,23 @@
+ 			 oldname[0] ? oldname : "???", name[0] ? name : "???"));
+ #endif
  
 +	/* If the user do not want to change the environment,
 +	 * use the current SHELL.
@@ -169,9 +169,9 @@
 +		shell = (char *) strdup (pwent.pw_shell);
 +
  #ifdef USE_PAM
- 	ret = pam_authenticate (pamh, 0);
- 	if (ret != PAM_SUCCESS) {
-@@ -692,7 +745,7 @@
+ 	/* set primary group id and supplementary groups */
+ 	if (setup_groups (&pwent)) {
+@@ -687,7 +740,7 @@
  	else {
  		addenv ("HOME", pwent.pw_dir);
  		addenv ("USER", pwent.pw_name);

Modified: branches/experimental/debian/patches/series
===================================================================
--- branches/experimental/debian/patches/series	2005-08-17 08:07:42 UTC (rev 444)
+++ branches/experimental/debian/patches/series	2005-08-17 08:13:32 UTC (rev 445)
@@ -2,13 +2,14 @@
 # 002_more-i18n.dpatch
 004_configure.in.dpatch
 005_manpages.dpatch
-# 336 has been applied upstream
+# 336 has been applied in 4.0.12
 # 336_chfn.1
 # 338_lastlog.8  # applied -- the authors should be separated. Submitted
 441_manpages-shadow.5
 440_manpages-login.1
 345_shadowconfig.8
-436_libmisc_chowntty_ro_root_fs
+# 436 has been applied in 4.0.12
+# 436_libmisc_chowntty_ro_root_fs
 435_su_addenv_HOME_and_SHELL
 431_su_uid_0_not_root
 437_su_add_GNU_options_1