[Pkg-shadow-commits] r1038 - trunk/debian/patches

[Christian Perrier]

Author: bubulle
Date: 2006-07-11 06:44:19 +0000 (Tue, 11 Jul 2006)
New Revision: 1038

Removed:
   trunk/debian/patches/301_useradd-375040
Modified:
   trunk/debian/patches/series
Log:
Patch applied upstream

Deleted: trunk/debian/patches/301_useradd-375040
===================================================================
--- trunk/debian/patches/301_useradd-375040	2006-07-11 06:31:10 UTC (rev 1037)
+++ trunk/debian/patches/301_useradd-375040	2006-07-11 06:44:19 UTC (rev 1038)
@@ -1,68 +0,0 @@
-Goal: Fix the user's mail spool creation
-
-Fixes: #375040
-
-Status vs upstream: Applied for 4.0.17
-
-Index: shadow-4.0.16/src/useradd.c
-===================================================================
---- shadow-4.0.16.orig/src/useradd.c	2006-06-22 19:44:51.048856000 +0200
-+++ shadow-4.0.16/src/useradd.c	2006-06-22 19:45:08.489946000 +0200
-@@ -1247,6 +1247,11 @@
- 			audit_logger (AUDIT_USER_CHAUTHTOK, Prog, "adding user",
- 				      user_name, -1, 0);
- #endif
-+
-+	/* TODO: add handle change default spool mail creation by 
-+	   -K CREATE_MAIL_SPOOL={yes,no}. It need rewrite internal API for handle
-+	   shadow tools configuration */
-+	create_mail_spool = def_create_mail_spool;
- 			exit (E_BAD_ARG);
- 		}
- 		if (!dflg) {
-@@ -1600,6 +1605,7 @@
-   }
- }
- 
-+		}
- /*
-  * create_mail - create the user's mail spool
-  *
-@@ -1624,23 +1630,22 @@
- 			perror (_("Creating mailbox file"));
- 			return;
- 
--			gr = getgrnam ("mail");
--			if (!gr) {
--				fprintf (stderr,
--					 _
--					 ("Group 'mail' not found. Creating the user mailbox file with 0600 mode.\n"));
--				gid = user_gid;
--				mode = 0600;
--			} else {
--				gid = gr->gr_gid;
--				mode = 0660;
--			}
-+		gr = getgrnam ("mail");
-+		if (!gr) {
-+			fprintf (stderr,
-+				 _
-+				 ("Group 'mail' not found. Creating the user mailbox file with 0600 mode.\n"));
-+			gid = user_gid;
-+			mode = 0600;
-+		} else {
-+			gid = gr->gr_gid;
-+			mode = 0660;
-+		}
- 
--			if (fchown (fd, user_id, gid) || fchmod (fd, mode))
--				perror (_("Setting mailbox file permissions"));
-+		if (fchown (fd, user_id, gid) || fchmod (fd, mode))
-+			perror (_("Setting mailbox file permissions"));
- 
--			close (fd);
--		}
-+		close (fd);
- 	}
- }
- 

Modified: trunk/debian/patches/series
===================================================================
--- trunk/debian/patches/series	2006-07-11 06:31:10 UTC (rev 1037)
+++ trunk/debian/patches/series	2006-07-11 06:44:19 UTC (rev 1038)
@@ -34,4 +34,3 @@
 402-clarify_usermod_usage
 487_passwd_chauthtok_failed_message
 403_fix_PATH-MAX_hurd
-301_useradd-375040