[Pkg-shadow-commits] r809 - in trunk/debian: . patches

[Alexander Gattin]

Author: xrgtn-guest
Date: 2006-01-16 00:07:51 +0000 (Mon, 16 Jan 2006)
New Revision: 809

Modified:
   trunk/debian/changelog
   trunk/debian/patches/485_shelle-exitcodes
   trunk/debian/patches/series
Log:
extend and enable 485th patch

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2006-01-15 15:28:22 UTC (rev 808)
+++ trunk/debian/changelog	2006-01-16 00:07:51 UTC (rev 809)
@@ -1,6 +1,11 @@
 shadow (1:4.0.14-4) UNRELEASED; urgency=low
 
   * The "Cancoillotte" release
+  * Upstream bugs or fixes not already fixed in upstream releases or CVS:
+    - 485_shelle_exitcodes:
+      - replace all shell() calls with shelle()
+      - introduce E_CMD_NOTFOUND/E_CMD_NOEXEC exitcodes
+      - minor beautification of code
 
  -- Christian Perrier <bubulle at debian.org>  Sun, 15 Jan 2006 16:27:15 +0100
 

Modified: trunk/debian/patches/485_shelle-exitcodes
===================================================================
--- trunk/debian/patches/485_shelle-exitcodes	2006-01-15 15:28:22 UTC (rev 808)
+++ trunk/debian/patches/485_shelle-exitcodes	2006-01-16 00:07:51 UTC (rev 809)
@@ -5,7 +5,7 @@
 Index: shadow-4.0.14/src/sulogin.c
 ===================================================================
 --- shadow-4.0.14.orig/src/sulogin.c	2005-12-06 23:25:00.000000000 +0200
-+++ shadow-4.0.14/src/sulogin.c	2006-01-15 15:38:49.000000000 +0200
++++ shadow-4.0.14/src/sulogin.c	2006-01-15 19:15:58.000000000 +0200
 @@ -39,6 +39,7 @@
  #include "getdef.h"
  #include "prototypes.h"
@@ -36,7 +36,7 @@
 Index: shadow-4.0.14/lib/exitcodes.h
 ===================================================================
 --- shadow-4.0.14.orig/lib/exitcodes.h	2005-08-31 20:36:11.000000000 +0300
-+++ shadow-4.0.14/lib/exitcodes.h	2006-01-15 13:03:59.000000000 +0200
++++ shadow-4.0.14/lib/exitcodes.h	2006-01-15 19:15:58.000000000 +0200
 @@ -11,3 +11,5 @@
  #define E_SHADOW_NOTFOUND	15	/* not found shadow password file */
  #define E_GROUP_NOTFOUND	16	/* not found group file */
@@ -45,8 +45,8 @@
 +#define E_CMD_NOTFOUND		127	/* can't find command/shell to run */
 Index: shadow-4.0.14/src/login.c
 ===================================================================
---- shadow-4.0.14.orig/src/login.c	2006-01-15 12:59:12.000000000 +0200
-+++ shadow-4.0.14/src/login.c	2006-01-15 15:39:24.000000000 +0200
+--- shadow-4.0.14.orig/src/login.c	2006-01-15 19:15:54.000000000 +0200
++++ shadow-4.0.14/src/login.c	2006-01-15 19:15:58.000000000 +0200
 @@ -47,6 +47,7 @@
  #include "getdef.h"
  #include "prototypes.h"
@@ -75,7 +75,7 @@
 Index: shadow-4.0.14/src/newgrp.c
 ===================================================================
 --- shadow-4.0.14.orig/src/newgrp.c	2005-12-06 23:25:00.000000000 +0200
-+++ shadow-4.0.14/src/newgrp.c	2006-01-15 15:39:50.000000000 +0200
++++ shadow-4.0.14/src/newgrp.c	2006-01-16 02:00:05.000000000 +0200
 @@ -38,9 +38,11 @@
  #include "defines.h"
  #include "getdef.h"
@@ -96,20 +96,23 @@
  	gid_t gid;
  	char *cp;
  	const char *cpasswd, *name, *prog;
-@@ -558,10 +561,10 @@
+@@ -556,13 +559,8 @@
+ 		audit_logger (AUDIT_USER_START, Prog, "changing",
+ 			      NULL, getuid (), 0);
  #endif
- 		if (errno == ENOENT) {
- 			perror ("/bin/sh");
+-		if (errno == ENOENT) {
+-			perror ("/bin/sh");
 -			exit (127);
-+			exit (E_CMD_NOTFOUND);
- 		} else {
- 			perror ("/bin/sh");
+-		} else {
+-			perror ("/bin/sh");
 -			exit (126);
-+			exit (E_CMD_NOEXEC);
- 		}
+-		}
++		perror ("/bin/sh");
++		exit (errno == ENOENT ? E_CMD_NOTFOUND : E_CMD_NOEXEC);
  	}
  
-@@ -631,7 +634,8 @@
+ 	/*
+@@ -631,7 +629,8 @@
  	 * Exec the login shell and go away. We are trying to get back to
  	 * the previous environment which should be the user's login shell.
  	 */
@@ -121,8 +124,8 @@
  
 Index: shadow-4.0.14/src/su.c
 ===================================================================
---- shadow-4.0.14.orig/src/su.c	2006-01-15 12:59:18.000000000 +0200
-+++ shadow-4.0.14/src/su.c	2006-01-15 13:20:47.000000000 +0200
+--- shadow-4.0.14.orig/src/su.c	2006-01-15 19:15:58.000000000 +0200
++++ shadow-4.0.14/src/su.c	2006-01-15 19:15:58.000000000 +0200
 @@ -187,14 +187,10 @@
  		pam_end (pamh, PAM_SUCCESS);
  
@@ -175,8 +178,8 @@
  #endif
 Index: shadow-4.0.14/libmisc/age.c
 ===================================================================
---- shadow-4.0.14.orig/libmisc/age.c	2006-01-15 15:37:24.000000000 +0200
-+++ shadow-4.0.14/libmisc/age.c	2006-01-15 15:38:10.000000000 +0200
+--- shadow-4.0.14.orig/libmisc/age.c	2005-08-31 20:24:57.000000000 +0300
++++ shadow-4.0.14/libmisc/age.c	2006-01-15 19:15:58.000000000 +0200
 @@ -35,6 +35,7 @@
  #include <errno.h>
  #include "prototypes.h"
@@ -194,3 +197,23 @@
  	} else if (pid == -1) {
  		perror ("fork");
  		exit (1);
+Index: shadow-4.0.14/src/userdel.c
+===================================================================
+--- shadow-4.0.14.orig/src/userdel.c	2006-01-15 19:15:58.000000000 +0200
++++ shadow-4.0.14/src/userdel.c	2006-01-16 02:01:58.000000000 +0200
+@@ -512,13 +512,8 @@
+ 	pid = fork ();
+ 	if (pid == 0) {
+ 		execl (cmd, cmd, user, (char *) 0);
+-		if (errno == ENOENT) {
+-			perror (cmd);
+-			_exit (127);
+-		} else {
+-			perror (cmd);
+-			_exit (126);
+-		}
++		perror (cmd);
++		_exit (errno == ENOENT ? E_CMD_NOTFOUND : E_CMD_NOEXEC);
+ 	} else if (pid == -1) {
+ 		perror ("fork");
+ 		return;

Modified: trunk/debian/patches/series
===================================================================
--- trunk/debian/patches/series	2006-01-15 15:28:22 UTC (rev 808)
+++ trunk/debian/patches/series	2006-01-16 00:07:51 UTC (rev 809)
@@ -48,7 +48,7 @@
 482_libmisc_copydir_check_return_values
 483_su_fakelogin_wrong_arg0
 484_su-p_preserve_PATH
-#485_shelle-exitcodes
+485_shelle-exitcodes
 # 999-2 is about using cdbs. It does not patch upstream files
 # so shouldn't be here, but we keep it for the future
 # 999-2_build_using_cdbs