From eb2337b2c71513a55263bcaced2843529773322f Mon Sep 17 00:00:00 2001
From: nekral-guest <nekral-guest@5a98b0ae-9ef6-0310-add3-de5d479b70d7>
Date: Wed, 19 Mar 2008 18:41:31 +0000
Subject: [PATCH] 462_warn_to_edit_shadow was applied upstream.

---
 debian/changelog                       |  1 +
 debian/patches/462_warn_to_edit_shadow | 68 --------------------------
 debian/patches/series                  |  1 -
 3 files changed, 1 insertion(+), 69 deletions(-)
 delete mode 100644 debian/patches/462_warn_to_edit_shadow

diff --git a/debian/changelog b/debian/changelog
index 23634541..b2da76eb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ shadow (1:4.1.1~rc1-1) UNRELEASED; urgency=low
       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@centraliens.net>  Sun, 24 Feb 2008 18:33:31 +0100
diff --git a/debian/patches/462_warn_to_edit_shadow b/debian/patches/462_warn_to_edit_shadow
deleted file mode 100644
index 3a1fa380..00000000
--- a/debian/patches/462_warn_to_edit_shadow
+++ /dev/null
@@ -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");
diff --git a/debian/patches/series b/debian/patches/series
index 8fd57e81..04fe9f17 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -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