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

[Nicolas FRANCOIS]

Author: nekral-guest
Date: 2006-10-21 16:42:58 +0000 (Sat, 21 Oct 2006)
New Revision: 1132

Added:
   trunk/debian/patches/493_pwck_no_SHADOWPWD
Modified:
   trunk/debian/changelog
   trunk/debian/patches/466_fflush-prompt
   trunk/debian/patches/series
Log:
SHADOWPWD should not be used anymore.
Also fix a compilation error triggered by the removal of #ifdef SHADOWPWD.


Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2006-10-21 16:34:36 UTC (rev 1131)
+++ trunk/debian/changelog	2006-10-21 16:42:58 UTC (rev 1132)
@@ -8,9 +8,13 @@
     - 401_cppw_src.dpatch:
       Fix cppw, which copied to /etc/passwd even with the -s switch.
       Closed: #394182
+    - 466_fflush-prompt: Fix compilation error.
+      One call to yes_or_no was forgotten because it was in
+      commented code (which is now enabled).
   * Upstream bugs not yet fixed in upstream releases or CVS but fixed
     in the etch branch (we don't want regressions):
-    - None
+    - 493_pwck_no_SHADOWPWD: SHADOWPWD no more exist.
+      pwck do not detect missing users in /etc/shadow.
 
  -- Christian Perrier <bubulle at debian.org>  Fri, 25 Aug 2006 12:00:51 +0200
 

Modified: trunk/debian/patches/466_fflush-prompt
===================================================================
--- trunk/debian/patches/466_fflush-prompt	2006-10-21 16:34:36 UTC (rev 1131)
+++ trunk/debian/patches/466_fflush-prompt	2006-10-21 16:42:58 UTC (rev 1132)
@@ -208,7 +208,7 @@
 Index: shadow-4.0.18.1/src/pwck.c
 ===================================================================
 --- shadow-4.0.18.1.orig/src/pwck.c	2006-05-07 19:44:39.000000000 +0200
-+++ shadow-4.0.18.1/src/pwck.c	2006-09-17 12:18:05.624098064 +0200
++++ shadow-4.0.18.1/src/pwck.c	2006-10-21 16:26:23.000000000 +0200
 @@ -49,6 +49,8 @@
  extern void __spw_del_entry (const struct commonio_entry *);
  extern struct commonio_entry *__spw_get_head (void);
@@ -276,6 +276,15 @@
  				goto delete_pw;
  		}
  
+@@ -382,7 +358,7 @@
+ 				printf (_("add user '%s' in %s? "),
+ 					pwd->pw_name, spw_file);
+ 				errors++;
+-				if (yes_or_no ()) {
++				if (yes_or_no (read_only)) {
+ 					struct spwd sp;
+ 					struct passwd pw;
+ 
 @@ -462,7 +438,7 @@
  			/*
  			 * prompt the user to delete the entry or not

Added: trunk/debian/patches/493_pwck_no_SHADOWPWD
===================================================================
--- trunk/debian/patches/493_pwck_no_SHADOWPWD	                        (rev 0)
+++ trunk/debian/patches/493_pwck_no_SHADOWPWD	2006-10-21 16:42:58 UTC (rev 1132)
@@ -0,0 +1,26 @@
+Goal: SHADOWPWD is now assumed (no more defined).
+
+Fixes: pwck do not detect missing users in /etc/shadow.
+
+Status wrt upstream: Not proposed to upstream yet.
+
+Index: shadow-4.0.18.1/src/pwck.c
+===================================================================
+--- shadow-4.0.18.1.orig/src/pwck.c	2006-10-21 13:33:12.000000000 +0200
++++ shadow-4.0.18.1/src/pwck.c	2006-10-21 13:36:29.000000000 +0200
+@@ -344,7 +344,6 @@
+ 				pwd->pw_name, pwd->pw_shell);
+ 			errors++;
+ 		}
+-#ifdef SHADOWPWD
+ 		/*
+ 		 * Make sure this entry exists in the /etc/gshadow file.
+ 		 */
+@@ -397,7 +396,6 @@
+ 				}
+ 			}
+ 		}
+-#endif
+ 	}
+ 
+ 	if (!is_shadow)

Modified: trunk/debian/patches/series
===================================================================
--- trunk/debian/patches/series	2006-10-21 16:34:36 UTC (rev 1131)
+++ trunk/debian/patches/series	2006-10-21 16:42:58 UTC (rev 1132)
@@ -42,3 +42,4 @@
 101_ja
 499_gettext-0.15
 102_de-fix-sorry
+493_pwck_no_SHADOWPWD