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

[Nicolas FRANCOIS]

Author: nekral-guest
Date: 2006-02-04 13:04:47 +0000 (Sat, 04 Feb 2006)
New Revision: 833

Added:
   trunk/debian/patches/489_useradd_allow_non_uniq_uid
Modified:
   trunk/debian/changelog
   trunk/debian/patches/series
Log:
Allow non-unique UID when -o is specified.


Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2006-01-29 07:49:26 UTC (rev 832)
+++ trunk/debian/changelog	2006-02-04 13:04:47 UTC (rev 833)
@@ -1,6 +1,9 @@
 shadow (1:4.0.14-5) UNRELEASED; urgency=low
 
   * The "Roquefort" release
+  * Upstream bugs or fixes not already fixed in upstream releases or CVS:
+    - 489_useradd_allow_non_uniq_uid:
+      Allow non-unique UID when -o is specified. Closes: #351281
 
  -- Christian Perrier <bubulle at debian.org>  Fri, 27 Jan 2006 21:39:23 +0100
 

Added: trunk/debian/patches/489_useradd_allow_non_uniq_uid
===================================================================
--- trunk/debian/patches/489_useradd_allow_non_uniq_uid	2006-01-29 07:49:26 UTC (rev 832)
+++ trunk/debian/patches/489_useradd_allow_non_uniq_uid	2006-02-04 13:04:47 UTC (rev 833)
@@ -0,0 +1,27 @@
+Goal: allow non-unique UID
+
+Fixes: #351281
+
+Status wrt upstream: not reported yet
+
+Index: shadow-4.0.14/src/useradd.c
+===================================================================
+--- shadow-4.0.14.orig/src/useradd.c	2006-01-24 01:13:37.000000000 +0100
++++ shadow-4.0.14/src/useradd.c	2006-02-04 13:56:09.000000000 +0100
+@@ -1757,10 +1757,12 @@
+ 	 */
+ 	open_files ();
+ 
+-	/* first, seek for a valid uid to use for this user.
+-	 * We do this because later we can use the uid we found as
+-	 * gid too ... --gafton */
+-	find_new_uid ();
++	if (!oflg){
++		/* first, seek for a valid uid to use for this user.
++		 * We do this because later we can use the uid we found as
++		 * gid too ... --gafton */
++		find_new_uid ();
++	}
+ 
+ 	/* do we have to add a group for that user? This is why we need to
+ 	 * open the group files in the open_files() function  --gafton */

Modified: trunk/debian/patches/series
===================================================================
--- trunk/debian/patches/series	2006-01-29 07:49:26 UTC (rev 832)
+++ trunk/debian/patches/series	2006-02-04 13:04:47 UTC (rev 833)
@@ -50,6 +50,7 @@
 484_su-p_preserve_PATH
 485_shell-env-exitcodes
 486_nowarn
+489_useradd_allow_non_uniq_uid
 # 999-2 is about using cdbs. It does not patch upstream files
 # so shouldn't be here, but we keep it for the future
 # 999-2_build_using_cdbs