[Pkg-shadow-devel] Ubuntu shadow 1:4.0.18.2-1ubuntu2

[Ubuntu Merge-o-Matic]

This e-mail has been sent due to an upload to Ubuntu that contains Ubuntu
changes.  It contains the difference between the new version and the
previous version of the same source package in Ubuntu.
-------------- next part --------------
Format: 1.7
Date: Fri, 08 Feb 2008 18:30:51 -0800
Source: shadow
Binary: login passwd
Architecture: source
Version: 1:4.0.18.2-1ubuntu2
Distribution: hardy
Urgency: low
Maintainer: Ubuntu Core Developers <ubuntu-devel-discuss at lists.ubuntu.com>
Changed-By: Matt T. Proud <mtp at google.com>
Description: 
 login      - system login tools
 passwd     - change and administer password and group data
Launchpad-Bugs-Fixed: 120015
Changes: 
 shadow (1:4.0.18.2-1ubuntu2) hardy; urgency=low
 .
   * Add 498_make_useradd_faster_with_ldap: make useradd faster when
     nsswitch uses LDAP or some other remote names database (LP: #120015),
     thanks to Vince Busam.
Files: 
 e067d2cc351a5e0f035edc0f215b5903 1148 admin required shadow_4.0.18.2-1ubuntu2.dsc
 98735607578dc43188772bae18b2b5b2 91423 admin required shadow_4.0.18.2-1ubuntu2.diff.gz
Original-Maintainer: Shadow package maintainers <pkg-shadow-devel at lists.alioth.debian.org>
-------------- next part --------------
diff -pruN 1:4.0.18.2-1ubuntu1/debian/changelog 1:4.0.18.2-1ubuntu2/debian/changelog
--- 1:4.0.18.2-1ubuntu1/debian/changelog	2008-04-28 22:21:02.000000000 +0100
+++ 1:4.0.18.2-1ubuntu2/debian/changelog	2008-04-28 22:21:01.000000000 +0100
@@ -1,3 +1,11 @@
+shadow (1:4.0.18.2-1ubuntu2) hardy; urgency=low
+
+  * Add 498_make_useradd_faster_with_ldap: make useradd faster when
+    nsswitch uses LDAP or some other remote names database (LP: #120015),
+    thanks to Vince Busam.
+
+ -- Matt T. Proud <mtp at google.com>  Fri, 08 Feb 2008 18:30:51 -0800
+
 shadow (1:4.0.18.2-1ubuntu1) hardy; urgency=low
 
   * debian/login.pam: Enable SELinux support in login.pam (LP: #191326).
diff -pruN 1:4.0.18.2-1ubuntu1/debian/patches/498_make_useradd_faster_with_ldap 1:4.0.18.2-1ubuntu2/debian/patches/498_make_useradd_faster_with_ldap
--- 1:4.0.18.2-1ubuntu1/debian/patches/498_make_useradd_faster_with_ldap	1970-01-01 01:00:00.000000000 +0100
+++ 1:4.0.18.2-1ubuntu2/debian/patches/498_make_useradd_faster_with_ldap	2008-04-28 22:21:01.000000000 +0100
@@ -0,0 +1,18 @@
+Index: src/useradd.c
+===================================================================
+--- shadow-4.0.18.2.orig/src/useradd.c	2008-02-08 18:24:54.000000000 -0800
++++ shadow-4.0.18.2/src/useradd.c	2008-02-08 18:26:55.000000000 -0800
+@@ -845,8 +845,12 @@
+ 	 * Start with some UID value if the user didn't provide us with
+ 	 * one already.
+ 	 */
+-	if (!uflg)
++	if (!uflg) {
+ 		user_id = uid_min;
++	} else {
++		if (!getpwuid(user_id) && !getpwnam(user_name))
++			return;
++	}
+ 
+ 	/*
+ 	 * Search the entire password file, either looking for this
diff -pruN 1:4.0.18.2-1ubuntu1/debian/patches/series 1:4.0.18.2-1ubuntu2/debian/patches/series
--- 1:4.0.18.2-1ubuntu1/debian/patches/series	2008-04-28 22:21:02.000000000 +0100
+++ 1:4.0.18.2-1ubuntu2/debian/patches/series	2008-04-28 22:21:01.000000000 +0100
@@ -50,3 +50,4 @@
 494_passwd_lock
 415_login_put-echoctl-back
 417_passwd_warndays
+498_make_useradd_faster_with_ldap