diff -u shadow-4.0.18.2/debian/patches/series shadow-4.0.18.2/debian/patches/series
--- shadow-4.0.18.2/debian/patches/series
+++ shadow-4.0.18.2/debian/patches/series
@@ -1,3 +1,4 @@
+498_make_useradd_faster_with_ldap
 503_shadowconfig.8
 431_su_uid_0_not_root
 008_su_no_sanitize_env
diff -u shadow-4.0.18.2/debian/control shadow-4.0.18.2/debian/control
--- shadow-4.0.18.2/debian/control
+++ shadow-4.0.18.2/debian/control
@@ -1,7 +1,8 @@
 Source: shadow
 Section: admin
 Priority: required
-Maintainer: Shadow package maintainers <pkg-shadow-devel@lists.alioth.debian.org>
+Maintainer: Ubuntu Core Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Shadow package maintainers <pkg-shadow-devel@lists.alioth.debian.org>
 Standards-Version: 3.7.2.0
 Uploaders: Christian Perrier <bubulle@debian.org>, Martin Quinson <mquinson@debian.org>, Nicolas FRANCOIS (Nekral) <nicolas.francois@centraliens.net>
 Build-Depends: autoconf, automake1.9, libtool, gettext, libpam0g-dev, debhelper (>= 5.0.0), quilt, dpkg-dev (>= 1.13.5), xsltproc, docbook-xsl, docbook-xml, libxml2-utils, cdbs, libselinux1-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64], gnome-doc-utils (>= 0.4.3-1)
diff -u shadow-4.0.18.2/debian/changelog shadow-4.0.18.2/debian/changelog
--- shadow-4.0.18.2/debian/changelog
+++ shadow-4.0.18.2/debian/changelog
@@ -1,3 +1,15 @@
+shadow (1:4.0.18.2-1ubuntu1) hardy; urgency=low
+
+  [ Vince Busam ]
+  * Make useradd faster when nsswitch uses LDAP or some other remote
+    names database (LP: #120015).
+
+  [ Matt T. Proud ]
+  * Modify Maintainer value to match the DebianMaintainerField
+    specification.
+
+ -- Matt T. Proud <mtp@google.com>  Fri, 08 Feb 2008 18:30:51 -0800
+
 shadow (1:4.0.18.2-1) unstable; urgency=low
 
   * The "Vacherin" release.
only in patch2:
unchanged:
--- shadow-4.0.18.2.orig/debian/patches/498_make_useradd_faster_with_ldap
+++ shadow-4.0.18.2/debian/patches/498_make_useradd_faster_with_ldap
@@ -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