[Pkg-shadow-commits] r463 - in branches/experimental/debian: . patches

[Christian Perrier]

Author: bubulle
Date: 2005-08-17 09:45:20 +0000 (Wed, 17 Aug 2005)
New Revision: 463

Modified:
   branches/experimental/debian/changelog
   branches/experimental/debian/patches/443_chage_exit_values
Log:
Refreshed to apply cleanly on 4.0.12
The exit code had to be change to 4 as upstream now uses 3. The define is
moved to lib/exitcodes.h


Modified: branches/experimental/debian/changelog
===================================================================
--- branches/experimental/debian/changelog	2005-08-17 09:35:15 UTC (rev 462)
+++ branches/experimental/debian/changelog	2005-08-17 09:45:20 UTC (rev 463)
@@ -12,6 +12,9 @@
       generated from the XML files)
     - Disable patches now applied upstream:
       002, 336, 363, 443_man_it_Makefile.am
+  * Upstream bugs not already fixed in upstream releases or CVS:
+    - 443_chage_exit_values: now exit with errorlevel=4 when no
+      shadow password exists (was previously 3 but upstream now uses it)
   * Debconf translation updates:
     - German updated. Closes: #321761
 

Modified: branches/experimental/debian/patches/443_chage_exit_values
===================================================================
--- branches/experimental/debian/patches/443_chage_exit_values	2005-08-17 09:35:15 UTC (rev 462)
+++ branches/experimental/debian/patches/443_chage_exit_values	2005-08-17 09:45:20 UTC (rev 463)
@@ -8,22 +8,19 @@
                      E_PW_UPDATE - like in groupdel/userdel)
                      I chose to only have E_SUCCESS/E_NOPERM, for future
                      backward compatibility.
+		     Note for 4.0.12: as upstream now uses the 3 exit code,
+		     the exit code for no shadow password file has been changed
+                     to 4
 
+                     This patch should really be forwarded upstream now
+
 Note:  upstream still has an exit (1)
 
-Index: shadow-4.0.11.1/src/chage.c
+Index: shadow-4.0.12/src/chage.c
 ===================================================================
---- shadow-4.0.11.1.orig/src/chage.c	2005-07-25 17:28:42.000000000 +0200
-+++ shadow-4.0.11.1/src/chage.c	2005-07-26 00:40:22.000000000 +0200
-@@ -86,6 +86,7 @@
- #define E_SUCCESS	0	/* success */
- #define E_NOPERM	1	/* permission denied */
- #define E_USAGE 	2	/* invalid command syntax */
-+#define E_NOT_SHADOWED	3	/* no shadow password file */
- 
- /* local function prototypes */
- static void usage (void);
-@@ -548,6 +549,15 @@
+--- shadow-4.0.12.orig/src/chage.c	2005-08-17 11:29:39.000000000 +0200
++++ shadow-4.0.12/src/chage.c	2005-08-17 11:35:35.000000000 +0200
+@@ -541,6 +541,15 @@
  	pwent = *pw;
  	STRFCPY (name, pwent.pw_name);
  
@@ -39,3 +36,12 @@
  	/*
  	 * For shadow password files we have to lock the file and read in
  	 * the entries as was done for the password file. The user entries
+Index: shadow-4.0.12/lib/exitcodes.h
+===================================================================
+--- shadow-4.0.12.orig/lib/exitcodes.h	2005-07-27 12:10:31.000000000 +0200
++++ shadow-4.0.12/lib/exitcodes.h	2005-08-17 11:42:14.000000000 +0200
+@@ -7,3 +7,4 @@
+ #define E_NOPERM        1	/* permission denied */
+ #define E_USAGE         2	/* invalid command syntax */
+ #define E_BAD_ARG       3	/* invalid argument to option */
++#define E_NOT_SHADOWED	4	/* no shadow password file */