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

[Christian Perrier]

Author: bubulle
Date: 2006-03-21 11:32:16 +0000 (Tue, 21 Mar 2006)
New Revision: 921

Modified:
   trunk/debian/changelog
   trunk/debian/patches/467_useradd_-r_LSB
Log:
Refresh patch 467 with 4.0.15
Add mention that this patch has been really activated in this release


Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2006-03-21 09:06:29 UTC (rev 920)
+++ trunk/debian/changelog	2006-03-21 11:32:16 UTC (rev 921)
@@ -25,6 +25,10 @@
     - Only replace manpages-de << 0.4-10. Thanks to Daniel Kobras
     - Only replace manpages-es-extra << 0.8a-15. Thanks to Javier
       Fernandez-Sanguino Peña.
+  * Upstream bugs or fixes not already fixed in upstream releases or CVS:
+    - 467_useradd_-r_LSB: add a "-r" option for adding system users
+      for LSB compatibility. Closes: #333706
+      This patch, announced in 4.0.14-7 was indeed not applied.
 
  -- Christian Perrier <bubulle at debian.org>  Mon,  6 Mar 2006 19:59:04 +0100
 

Modified: trunk/debian/patches/467_useradd_-r_LSB
===================================================================
--- trunk/debian/patches/467_useradd_-r_LSB	2006-03-21 09:06:29 UTC (rev 920)
+++ trunk/debian/patches/467_useradd_-r_LSB	2006-03-21 11:32:16 UTC (rev 921)
@@ -6,10 +6,10 @@
                      is really ready to apply it. We apply it anyway because 
                      LSB compliance is important for Debian
 
-Index: shadow-4.0.14/src/useradd.c
+Index: shadow-4.0.15/src/useradd.c
 ===================================================================
---- shadow-4.0.14.orig/src/useradd.c	2006-02-14 13:51:51.330033243 +0100
-+++ shadow-4.0.14/src/useradd.c	2006-02-14 13:52:04.908279473 +0100
+--- shadow-4.0.15.orig/src/useradd.c	2006-03-21 11:21:18.833662408 +0100
++++ shadow-4.0.15/src/useradd.c	2006-03-21 11:23:19.670292448 +0100
 @@ -127,6 +127,7 @@
      mflg = 0,			/* create user's home directory if it doesn't exist */
      nflg = 0,			/* create a group having the same name as the user */
@@ -92,7 +92,7 @@
  			case 's':
  				if (!VALID (optarg)
  				    || (optarg[0]
-@@ -1556,23 +1575,25 @@
+@@ -1558,24 +1577,27 @@
   */
  static void create_home (void)
  {
@@ -106,9 +106,15 @@
 -			fail_exit (E_HOMEDIR);
 -		}
 -		chown (user_home, user_id, user_gid);
--		chmod (user_home, 0777 & ~getdef_num ("UMASK", 022));
+-		chmod (user_home,
+-		       0777 & ~getdef_num ("UMASK", GETDEF_DEFAULT_UMASK));
 -		home_added++;
-+	if (!rflg) /* for system accounts defaults are ignored and we
+-#ifdef WITH_AUDIT
+-		audit_logger (AUDIT_USER_CHAUTHTOK, Prog,
+-			      "adding home directory", user_name, user_id, 1);
+-#endif
+-	}
++  if (!rflg) { /* for system accounts defaults are ignored and we
 +		    * do not create a home dir -- gafton */
 +		if (access (user_home, F_OK)) {
 +			/* XXX - create missing parent directories.  --marekm */
@@ -119,16 +125,16 @@
 +				 	Prog, user_home);
 +				fail_exit (E_HOMEDIR);
 +			}
-+			chown (user_home, user_id, user_gid);
++			chmod (user_home,
++			       0777 & ~getdef_num ("UMASK", GETDEF_DEFAULT_UMASK));
 +			chmod (user_home, 0777 & ~getdef_num ("UMASK", 022));
 +			home_added++;
- #ifdef WITH_AUDIT
--		audit_logger (AUDIT_USER_CHAUTHTOK, Prog,
++  #ifdef WITH_AUDIT
 +			audit_logger (AUDIT_USER_CHAUTHTOK, Prog,
- 			      "adding home directory", user_name, user_id, 1);
- #endif
--	}
++  			      "adding home directory", user_name, user_id, 1);
++  #endif
 +		}
++  }
  }
  
  /*