update to rev. 240, fixes a potential information disclosure when TLS

and referrals are used together (http://secunia.com/advisories/15906/)
mostly from Adrian Portelli, tested by me
(The most recent version 242 kills the system completely if the LDAP
server is not running -- endless connection retries.)

4 files changed, 16 insertions, 31 deletions

diff --git a/databases/nss_ldap/Makefile b/databases/nss_ldap/Makefile
index 308ce6662dd..d41f11edd3e 100644
--- a/databases/nss_ldap/Makefile
+++ b/databases/nss_ldap/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2005/09/14 16:44:12 drochner Exp $
+# $NetBSD: Makefile,v 1.4 2005/09/19 16:13:26 drochner Exp $
 #
 
-DISTNAME=		nss_ldap-239
-PKGREVISION=		1
+DISTNAME=		nss_ldap-240
 CATEGORIES=		databases
 MASTER_SITES=		http://www.padl.com/download/
 
diff --git a/databases/nss_ldap/distinfo b/databases/nss_ldap/distinfo
index deb4bb5e769..6fa7616f837 100644
--- a/databases/nss_ldap/distinfo
+++ b/databases/nss_ldap/distinfo
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.2 2005/08/30 12:47:52 drochner Exp $
+$NetBSD: distinfo,v 1.3 2005/09/19 16:13:26 drochner Exp $
 
-SHA1 (nss_ldap-239.tar.gz) = beee30b433a01dccd863e7a0cdb7fe87cefda7fd
-RMD160 (nss_ldap-239.tar.gz) = 525ed402ef5959a2740a7539c309c478a4765381
-Size (nss_ldap-239.tar.gz) = 222276 bytes
+SHA1 (nss_ldap-240.tar.gz) = 929cea7e0fe4542bf24112ae428efffb7dc510ba
+RMD160 (nss_ldap-240.tar.gz) = 58a94bc8441461e779c546cbb447bee3efb0fead
+Size (nss_ldap-240.tar.gz) = 228656 bytes
 SHA1 (patch-ab) = 01493e92ffff0125dd3267810ee33cdeaab32ab2
-SHA1 (patch-af) = e69bdf7ae84f207e690f664bb5d5f4e5b6894604
+SHA1 (patch-af) = 6dc9d1df0f601361686832ac8d632936e260281e
 SHA1 (patch-ag) = 95741f39fb03195b3238d4f9c24360049fdd3698
-SHA1 (patch-ah) = 8646360203dc0fbeccc76eda989323eb13605421
diff --git a/databases/nss_ldap/patches/patch-af b/databases/nss_ldap/patches/patch-af
index 45d4c45e336..c49adfaea96 100644
--- a/databases/nss_ldap/patches/patch-af
+++ b/databases/nss_ldap/patches/patch-af
@@ -1,6 +1,6 @@
-$NetBSD: patch-af,v 1.2 2005/08/30 12:47:52 drochner Exp $
+$NetBSD: patch-af,v 1.3 2005/09/19 16:13:26 drochner Exp $
 
---- Makefile.in.orig	2005-05-24 02:53:19.000000000 +0200
+--- Makefile.in.orig	2005-09-18 19:47:08.000000000 +0100
 +++ Makefile.in
 @@ -75,14 +75,14 @@ nss_ldap_so_LD = @nss_ldap_so_LD@
  noinst_PROGRAMS = nss_ldap.so $(authmod)
@@ -14,21 +14,21 @@ $NetBSD: patch-af,v 1.2 2005/08/30 12:47:52 drochner Exp $
  
  man_MANS = nss_ldap.5
  
--nss_ldap_so_SOURCES = ldap-nss.c ldap-pwd.c ldap-grp.c ldap-netgrp.c ldap-rpc.c 	ldap-hosts.c ldap-network.c ldap-proto.c ldap-spwd.c 	ldap-alias.c ldap-service.c ldap-schema.c ldap-ethers.c 	ldap-bp.c util.c ltf.c snprintf.c resolve.c 	dnsconfig.c irs-nss.c pagectrl.c
-+nss_ldap_so_SOURCES = ldap-nss.c ldap-pwd.c ldap-grp.c ldap-netgrp.c ldap-rpc.c 	ldap-hosts.c ldap-network.c ldap-proto.c ldap-spwd.c 	ldap-alias.c ldap-service.c ldap-schema.c ldap-ethers.c 	ldap-bp.c util.c ltf.c snprintf.c resolve.c 	dnsconfig.c irs-nss.c pagectrl.c netbsd.c
+-nss_ldap_so_SOURCES = ldap-nss.c ldap-pwd.c ldap-grp.c ldap-netgrp.c ldap-rpc.c 	ldap-hosts.c ldap-network.c ldap-proto.c ldap-spwd.c 	ldap-alias.c ldap-service.c ldap-schema.c ldap-ethers.c 	ldap-bp.c ldap-automount.c util.c ltf.c snprintf.c resolve.c 	dnsconfig.c irs-nss.c pagectrl.c
++nss_ldap_so_SOURCES = ldap-nss.c ldap-pwd.c ldap-grp.c ldap-netgrp.c ldap-rpc.c 	ldap-hosts.c ldap-network.c ldap-proto.c ldap-spwd.c 	ldap-alias.c ldap-service.c ldap-schema.c ldap-ethers.c 	ldap-bp.c ldap-automount.c util.c ltf.c snprintf.c resolve.c 	dnsconfig.c irs-nss.c pagectrl.c netbsd.c
  
  
  nss_ldap_so_LDFLAGS = @nss_ldap_so_LDFLAGS@
-@@ -121,7 +121,7 @@ LIBS = @LIBS@
- nss_ldap_so_OBJECTS =  ldap-nss.o ldap-pwd.o ldap-grp.o ldap-netgrp.o \
+@@ -122,7 +122,7 @@ nss_ldap_so_OBJECTS =  ldap-nss.o ldap-p
  ldap-rpc.o ldap-hosts.o ldap-network.o ldap-proto.o ldap-spwd.o \
  ldap-alias.o ldap-service.o ldap-schema.o ldap-ethers.o ldap-bp.o \
--util.o ltf.o snprintf.o resolve.o dnsconfig.o irs-nss.o pagectrl.o
-+util.o ltf.o snprintf.o resolve.o dnsconfig.o irs-nss.o pagectrl.o netbsd.o
+ ldap-automount.o util.o ltf.o snprintf.o resolve.o dnsconfig.o \
+-irs-nss.o pagectrl.o
++irs-nss.o pagectrl.o netbsd.o
  nss_ldap_so_LDADD = $(LDADD)
  nss_ldap_so_DEPENDENCIES = 
  NSS_LDAP_OBJECTS =  ldap-nss.o ldap-grp.o ldap-pwd.o ldap-netgrp.o \
-@@ -496,10 +496,8 @@ maintainer-clean-generic clean mostlycle
+@@ -498,10 +498,8 @@ maintainer-clean-generic clean mostlycle
  
  install-data-local:
  	@$(NORMAL_INSTALL)
diff --git a/databases/nss_ldap/patches/patch-ah b/databases/nss_ldap/patches/patch-ah
deleted file mode 100644
index d06d5c78a21..00000000000
--- a/databases/nss_ldap/patches/patch-ah
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ah,v 1.1 2005/08/30 12:47:52 drochner Exp $
-
---- ldap-grp.c.orig	2005-08-30 13:51:39.000000000 +0200
-+++ ldap-grp.c
-@@ -1115,6 +1115,8 @@ char *_nss_ldap_getgrset (char *user)
-     }
- #else
-   filter = _nss_ldap_filt_getgroupsbymember;
-+  gidnumber_attrs[0] = ATM (group, gidNumber);
-+  gidnumber_attrs[1] = NULL;
- #endif /* RFC2307BIS */
- 
-   stat = _nss_ldap_getent_ex (&a, &ctx, (void *) &lia, NULL, 0,