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

[nekral-guest at alioth.debian.org]

Author: nekral-guest
Date: 2008-03-19 18:41:31 +0000 (Wed, 19 Mar 2008)
New Revision: 1914

Removed:
   debian/trunk/debian/patches/462_warn_to_edit_shadow
Modified:
   debian/trunk/debian/changelog
   debian/trunk/debian/patches/series
Log:
462_warn_to_edit_shadow was applied upstream.


Modified: debian/trunk/debian/changelog
===================================================================
--- debian/trunk/debian/changelog	2008-03-19 18:39:15 UTC (rev 1913)
+++ debian/trunk/debian/changelog	2008-03-19 18:41:31 UTC (rev 1914)
@@ -9,6 +9,7 @@
       Closes: #470745
     - Remove patches applied upstream:
       + debian/patches/451_login_PATH
+      + debian/patches/462_warn_to_edit_shadow
   * debian/watch: Add a watch file for shadow.
 
  -- Nicolas FRANCOIS (Nekral) <nicolas.francois at centraliens.net>  Sun, 24 Feb 2008 18:33:31 +0100

Deleted: debian/trunk/debian/patches/462_warn_to_edit_shadow
===================================================================
--- debian/trunk/debian/patches/462_warn_to_edit_shadow	2008-03-19 18:39:15 UTC (rev 1913)
+++ debian/trunk/debian/patches/462_warn_to_edit_shadow	2008-03-19 18:41:31 UTC (rev 1914)
@@ -1,68 +0,0 @@
-Goal: Warn about possible need to edit shadow files when editing the 
-      master files with vipw
-
-Fixes: #62821
-
-Status wrt upstream: Forwarded but not applied yet
-
-Index: shadow-4.1.0/src/vipw.c
-===================================================================
---- shadow-4.1.0.orig/src/vipw.c
-+++ shadow-4.1.0/src/vipw.c
-@@ -41,6 +41,12 @@
- #include "pwio.h"
- #include "sgroupio.h"
- #include "shadowio.h"
-+
-+#define MSG_WARN_EDIT_OTHER_FILE _( \
-+	"You have modified %s.\n"\
-+	"You may need to modify %s for consistency.\n"\
-+	"Please use the command `%s' to do so.\n")
-+
- /*
-  * Global variables
-  */
-@@ -285,17 +291,39 @@
- 	}
- 
- 	if (do_vipw) {
--		if (editshadow)
-+		if (editshadow) {
- 			vipwedit (SHADOW_FILE, spw_lock, spw_unlock);
--		else
-+			printf (MSG_WARN_EDIT_OTHER_FILE,
-+			        SHADOW_FILE,
-+			        PASSWD_FILE,
-+			        "vipw");
-+		} else {
- 			vipwedit (PASSWD_FILE, pw_lock, pw_unlock);
-+			if (spw_file_present ())
-+				printf (MSG_WARN_EDIT_OTHER_FILE,
-+				        PASSWD_FILE,
-+				        SHADOW_FILE,
-+				        "vipw -s");
-+		}
- 	} else {
- #ifdef SHADOWGRP
--		if (editshadow)
-+		if (editshadow) {
- 			vipwedit (SGROUP_FILE, sgr_lock, sgr_unlock);
--		else
-+			printf (MSG_WARN_EDIT_OTHER_FILE,
-+			        SGROUP_FILE,
-+			        GROUP_FILE,
-+			        "vigr");
-+		} else {
- #endif
- 			vipwedit (GROUP_FILE, gr_lock, gr_unlock);
-+#ifdef SHADOWGRP
-+			if (sgr_file_present ())
-+				printf (MSG_WARN_EDIT_OTHER_FILE,
-+				        GROUP_FILE,
-+				        SGROUP_FILE,
-+				        "vigr -s");
-+#endif
-+		}
- 	}
- 
- 	nscd_flush_cache ("passwd");

Modified: debian/trunk/debian/patches/series
===================================================================
--- debian/trunk/debian/patches/series	2008-03-19 18:39:15 UTC (rev 1913)
+++ debian/trunk/debian/patches/series	2008-03-19 18:41:31 UTC (rev 1914)
@@ -14,7 +14,6 @@
 542_useradd-O_option
 454_userdel_no_MAIL_FILE
 501_commonio_group_shadow
-462_warn_to_edit_shadow
 463_login_delay_obeys_to_PAM
 467_useradd_-r_LSB
 466_fflush-prompt