Added a patch for nsswitch.ldap so a files lookup is done before dns to resolve hosts.

4 files changed, 37 insertions, 13 deletions

diff --git a/net-libs/nss_ldap/ChangeLog b/net-libs/nss_ldap/ChangeLog
index 496602e1cdd3..c923fb5f1a9d 100644
--- a/net-libs/nss_ldap/ChangeLog
+++ b/net-libs/nss_ldap/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-libs/nss_ldap
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/nss_ldap/ChangeLog,v 1.25 2004/06/06 10:06:48 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/nss_ldap/ChangeLog,v 1.26 2004/06/08 05:43:30 raker Exp $
+
+  08 Jun 2004; Nick Hadaway <raker@gentoo.org> nss_ldap-215-r1.ebuild,
+  files/nsswitch.ldap.diff :
+  adds a files lookup for hosts in /etc/nsswitch.ldap.
+  Many people do not have proper dns entries for their Base DN.
+  See bug #50830.  Not bumping this as there is no recompile required.
 
   06 Jun 2004; Guy Martin <gmsoft@gentoo.org> nss_ldap-215-r1.ebuild:
   Marked stable on hppa.
diff --git a/net-libs/nss_ldap/Manifest b/net-libs/nss_ldap/Manifest
index 47d97d3d7552..6922bc69abf9 100644
--- a/net-libs/nss_ldap/Manifest
+++ b/net-libs/nss_ldap/Manifest
@@ -1,21 +1,22 @@
-MD5 78be5830f71cbd40250960be5546bddf ChangeLog 3842
-MD5 12158b386c76f1fa317b9b474abfb30e metadata.xml 249
 MD5 bbefcdee0b752c8c7b20f2b9a9c6fc57 nss_ldap-174-r2.ebuild 1012
-MD5 e60cf713adbf02ace612603a5501da61 nss_ldap-202.ebuild 1021
 MD5 19e8d8d543cdacc4b27eb1ea43931fb0 nss_ldap-207-r1.ebuild 991
-MD5 3612286efc8caf0d83d4e804c27ca339 nss_ldap-207.ebuild 1061
-MD5 0a352a7878463aacdddf3504a568ab79 nss_ldap-209.1.ebuild 1459
+MD5 32e349d127fa93c207f6fba13aa2d067 nss_ldap-215.ebuild 1312
 MD5 dbd46cfbf491384f65b858a28e9b0965 nss_ldap-210.ebuild 1449
+MD5 0a352a7878463aacdddf3504a568ab79 nss_ldap-209.1.ebuild 1459
+MD5 9d81e1125b9752c4cabc829ec7c1a3be nss_ldap-215-r1.ebuild 1496
 MD5 3fe5b3f993b56f7748c04767ecb4371b nss_ldap-211.ebuild 1450
-MD5 7e35b1d667a785b237f5035519a981e0 nss_ldap-215-r1.ebuild 1450
-MD5 32e349d127fa93c207f6fba13aa2d067 nss_ldap-215.ebuild 1312
-MD5 a4302c4120b75a23e43cc824423169c8 files/db4_1.85.diff 1569
+MD5 3612286efc8caf0d83d4e804c27ca339 nss_ldap-207.ebuild 1061
+MD5 e60cf713adbf02ace612603a5501da61 nss_ldap-202.ebuild 1021
+MD5 5ad48c6d4dc1d554fbf8f9ab6ff629b0 ChangeLog 4131
+MD5 12158b386c76f1fa317b9b474abfb30e metadata.xml 249
 MD5 5d7731acb703d8ae122072ad73cbc2a6 files/digest-nss_ldap-174-r2 129
+MD5 8d358c3dda5ce728c6fd5f8f4bc448d2 files/digest-nss_ldap-207-r1 64
+MD5 b2dc517b69cad6d24fce3d19a7879dcf files/digest-nss_ldap-215-r1 64
 MD5 d8021fe04d76482091c816f28edad140 files/digest-nss_ldap-202 64
 MD5 8d358c3dda5ce728c6fd5f8f4bc448d2 files/digest-nss_ldap-207 64
-MD5 8d358c3dda5ce728c6fd5f8f4bc448d2 files/digest-nss_ldap-207-r1 64
-MD5 66e79b5d5f9f5105ad2988280f27475d files/digest-nss_ldap-209.1 66
 MD5 c1919ec630e0278d0e09787a14d497a9 files/digest-nss_ldap-210 64
 MD5 4dc20eb7ee3f4a562d6ad00a0609cfbc files/digest-nss_ldap-211 64
 MD5 b2dc517b69cad6d24fce3d19a7879dcf files/digest-nss_ldap-215 64
-MD5 b2dc517b69cad6d24fce3d19a7879dcf files/digest-nss_ldap-215-r1 64
+MD5 66e79b5d5f9f5105ad2988280f27475d files/digest-nss_ldap-209.1 66
+MD5 a4302c4120b75a23e43cc824423169c8 files/db4_1.85.diff 1569
+MD5 1fe060c70b1c673346b696dbe194260a files/nsswitch.ldap.diff 575
diff --git a/net-libs/nss_ldap/files/nsswitch.ldap.diff b/net-libs/nss_ldap/files/nsswitch.ldap.diff
new file mode 100644
index 000000000000..a8e96e05e8d8
--- /dev/null
+++ b/net-libs/nss_ldap/files/nsswitch.ldap.diff
@@ -0,0 +1,15 @@
+--- nsswitch.ldap	2004-06-08 00:34:09.895330016 -0500
++++ nsswitch.ldap-modified	2004-06-08 00:35:21.518441648 -0500
+@@ -10,10 +10,10 @@
+ passwd:		files ldap
+ group:		files ldap
+ 
+-# consult DNS first, we will need it to resolve the LDAP host. (If we
++# consult files/dns first, we will need it to resolve the LDAP host. (If we
+ # can't resolve it, we're in infinite recursion, because libldap calls
+ # gethostbyname(). Careful!)
+-hosts:		dns ldap
++hosts:		files dns ldap
+ 
+ # LDAP is nominally authoritative for the following maps.
+ services:   ldap [NOTFOUND=return] files
diff --git a/net-libs/nss_ldap/nss_ldap-215-r1.ebuild b/net-libs/nss_ldap/nss_ldap-215-r1.ebuild
index 632f2ee0dd8d..ec33932a8af0 100644
--- a/net-libs/nss_ldap/nss_ldap-215-r1.ebuild
+++ b/net-libs/nss_ldap/nss_ldap-215-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/nss_ldap/nss_ldap-215-r1.ebuild,v 1.6 2004/06/06 10:06:48 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/nss_ldap/nss_ldap-215-r1.ebuild,v 1.7 2004/06/08 05:43:30 raker Exp $
 
 inherit fixheadtails eutils
 
@@ -21,6 +21,8 @@ src_unpack() {
 	unpack ${A}
 	# bug #34717
 	epatch ${FILESDIR}/db4_1.85.diff
+	cd ${S}
+	epatch ${FILESDIR}/nsswitch.ldap.diff
 }
 
 src_compile() {