CVS commit: src/external/bsd/openldap/dist/libraries/liblutil

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Mon Mar  4 17:10:33 UTC 2024

Modified Files:
src/external/bsd/openldap/dist/libraries/liblutil: getpass.c

Log Message:
Fix DEBUG build.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/external/bsd/openldap/dist/libraries/liblutil/getpass.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/external/bsd/openldap/dist/libraries/liblutil

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Mon Mar  4 17:10:33 UTC 2024

Modified Files:
src/external/bsd/openldap/dist/libraries/liblutil: getpass.c

Log Message:
Fix DEBUG build.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/external/bsd/openldap/dist/libraries/liblutil/getpass.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/openldap/dist/libraries/liblutil/getpass.c
diff -u src/external/bsd/openldap/dist/libraries/liblutil/getpass.c:1.3 src/external/bsd/openldap/dist/libraries/liblutil/getpass.c:1.4
--- src/external/bsd/openldap/dist/libraries/liblutil/getpass.c:1.3	Sat Aug 14 12:14:58 2021
+++ src/external/bsd/openldap/dist/libraries/liblutil/getpass.c	Mon Mar  4 12:10:33 2024
@@ -1,4 +1,4 @@
-/*	$NetBSD: getpass.c,v 1.3 2021/08/14 16:14:58 christos Exp $	*/
+/*	$NetBSD: getpass.c,v 1.4 2024/03/04 17:10:33 christos Exp $	*/
 
 /* getpass.c -- get password from user */
 /* $OpenLDAP$ */
@@ -33,7 +33,7 @@
  */
 
 #include 
-__RCSID("$NetBSD: getpass.c,v 1.3 2021/08/14 16:14:58 christos Exp $");
+__RCSID("$NetBSD: getpass.c,v 1.4 2024/03/04 17:10:33 christos Exp $");
 
 #include "portable.h"
 
@@ -86,11 +86,6 @@ lutil_getpass( const char *prompt )
 
 	if( prompt == NULL ) prompt = _("Password: ");
 
-#ifdef DEBUG
-	if (debug & D_TRACE)
-		printf("->getpass(%s)\n", prompt);
-#endif
-
 #if defined(HAVE_TERMIOS_H) || defined(HAVE_SGTTY_H)
 	if ((fi = fopen(TTY, "r")) == NULL)
 		fi = stdin;

CVS commit: src/external/bsd/openldap

[Luke Mewburn]

Module Name:src
Committed By:   lukem
Date:   Sun May 28 11:00:04 UTC 2023

Modified Files:
src/external/bsd/openldap/dist/include: portable.hin
src/external/bsd/openldap/include: portable.h

Log Message:
deprecate remnants of MKCRYPTO

MKCRYPTO was removed by riastradh@ on 2017-05-22,
so remove references to it in comments.


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 \
src/external/bsd/openldap/dist/include/portable.hin
cvs rdiff -u -r1.10 -r1.11 src/external/bsd/openldap/include/portable.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/external/bsd/openldap

[Luke Mewburn]

Module Name:src
Committed By:   lukem
Date:   Sun May 28 11:00:04 UTC 2023

Modified Files:
src/external/bsd/openldap/dist/include: portable.hin
src/external/bsd/openldap/include: portable.h

Log Message:
deprecate remnants of MKCRYPTO

MKCRYPTO was removed by riastradh@ on 2017-05-22,
so remove references to it in comments.


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 \
src/external/bsd/openldap/dist/include/portable.hin
cvs rdiff -u -r1.10 -r1.11 src/external/bsd/openldap/include/portable.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/openldap/dist/include/portable.hin
diff -u src/external/bsd/openldap/dist/include/portable.hin:1.10 src/external/bsd/openldap/dist/include/portable.hin:1.11
--- src/external/bsd/openldap/dist/include/portable.hin:1.10	Sat Aug 14 16:14:55 2021
+++ src/external/bsd/openldap/dist/include/portable.hin	Sun May 28 11:00:03 2023
@@ -755,7 +755,7 @@
 /* Define to 1 if you have the `thr_yield' function. */
 #undef HAVE_THR_YIELD
 
-#if 0	/* NETBSD: We'll control via Makefile and ${MKCRYPTO} */
+#if 0	/* NETBSD: We'll control via Makefile */
 /* define if you have TLS */
 #undef HAVE_TLS
 #endif

Index: src/external/bsd/openldap/include/portable.h
diff -u src/external/bsd/openldap/include/portable.h:1.10 src/external/bsd/openldap/include/portable.h:1.11
--- src/external/bsd/openldap/include/portable.h:1.10	Tue Dec 28 17:05:43 2021
+++ src/external/bsd/openldap/include/portable.h	Sun May 28 11:00:04 2023
@@ -753,7 +753,7 @@
 /* Define to 1 if you have the `thr_yield' function. */
 /* #undef HAVE_THR_YIELD */
 
-#if 0	/* NETBSD: We'll control via Makefile and ${MKCRYPTO} */
+#if 0	/* NETBSD: We'll control via Makefile */
 /* define if you have TLS */
 #define HAVE_TLS 1
 #endif

CVS commit: src/external/bsd/openldap/lib/libldap

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Tue May  9 01:21:09 UTC 2023

Modified Files:
src/external/bsd/openldap/lib/libldap: Makefile.libldap

Log Message:
accommodate OpenSSL-3.x


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 \
src/external/bsd/openldap/lib/libldap/Makefile.libldap

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/openldap/lib/libldap/Makefile.libldap
diff -u src/external/bsd/openldap/lib/libldap/Makefile.libldap:1.13 src/external/bsd/openldap/lib/libldap/Makefile.libldap:1.14
--- src/external/bsd/openldap/lib/libldap/Makefile.libldap:1.13	Sun Sep 12 21:12:36 2021
+++ src/external/bsd/openldap/lib/libldap/Makefile.libldap	Mon May  8 21:21:09 2023
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.libldap,v 1.13 2021/09/13 01:12:36 dholland Exp $
+#	$NetBSD: Makefile.libldap,v 1.14 2023/05/09 01:21:09 christos Exp $
 
 .include "../../openldap.mk"
 
@@ -22,6 +22,8 @@ SRCS+=		tls2.c tls_o.c tls_g.c
 
 CPPFLAGS+=	-DLDAP_LIBRARY
 
+COPTS.tls_o.c+=-Wno-error=deprecated-declarations
+
 LIBDPLIBS+=	lber	${.CURDIR}/../liblber
 
 .if ${USE_KERBEROS} != "no"

CVS commit: src/external/bsd/openldap/lib/libldap

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Tue May  9 01:21:09 UTC 2023

Modified Files:
src/external/bsd/openldap/lib/libldap: Makefile.libldap

Log Message:
accommodate OpenSSL-3.x


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 \
src/external/bsd/openldap/lib/libldap/Makefile.libldap

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/external/bsd/openldap/sbin/slapd

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Wed Dec 29 18:13:43 UTC 2021

Modified Files:
src/external/bsd/openldap/sbin/slapd: Makefile

Log Message:
build the rest of the tools.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/openldap/sbin/slapd/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/openldap/sbin/slapd/Makefile
diff -u src/external/bsd/openldap/sbin/slapd/Makefile:1.1 src/external/bsd/openldap/sbin/slapd/Makefile:1.2
--- src/external/bsd/openldap/sbin/slapd/Makefile:1.1	Tue Dec 28 12:05:44 2021
+++ src/external/bsd/openldap/sbin/slapd/Makefile	Wed Dec 29 13:13:43 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2021/12/28 17:05:44 christos Exp $
+# $NetBSD: Makefile,v 1.2 2021/12/29 18:13:43 christos Exp $
 
 .include 
 
@@ -10,6 +10,12 @@ CPPFLAGS+=-I${SLAPD} -I${SLAPD}/back-mon
 
 MAN=slapd.8 slapd.conf.5
 PROG = slapd
+TOOLS=slapadd slapcat slapdn slapindex slapmodify slappasswd slaptest \
+slapauth slapacl slapschema
+.for tool in ${TOOLS}
+LINKS+= ${BINDIR}/slapd ${BINDIR}/${tool}
+MAN+=${tool}.8
+.endfor
 
 SRCS += \
 	main.c globals.c bconfig.c config.c daemon.c \
@@ -42,13 +48,19 @@ PROGDPLIBS+= \
 
 __makeman: .USE
 	${_MKTARGET_CREATE}
-	${TOOL_SED} -e s@LIBEXECDIR@/usr/sbin@g \
+	${TOOL_SED} \
+	-e s@LOCALSTATEDIR@/var@g \
+	-e s@SYSCONFDIR@/etc/openldap@g \
+	-e s@DATADIR@/usr/share@g \
+	-e s@SBINDIR@/usr/sbin@g \
+	-e s@BINDIR@/usr/bin@g \
+	-e s@LIBDIR@/usr/lib@g \
+	-e s@LIBEXECDIR@/usr/sbin@g \
+	-e s@MODULEDIR@/usr/lib/openldap@g \
 	-e s@ETCDIR@/etc/openldap@g ${.ALLSRC} > ${.TARGET}
 
-slapd.8: ${LDAP_DISTDIR}/doc/man/man8/slapd.8 __makeman
-slapd.conf.5: ${LDAP_DISTDIR}/doc/man/man5/slapd.conf.5 __makeman
-
-
-CLEANFILES+= slapd.8
+.for man in ${MAN}
+${man}: ${LDAP_DISTDIR}/doc/man/man${man:E}/${man} __makeman
+.endfor
 
 .include 

CVS commit: src/external/bsd/openldap/sbin/slapd

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Wed Dec 29 18:13:43 UTC 2021

Modified Files:
src/external/bsd/openldap/sbin/slapd: Makefile

Log Message:
build the rest of the tools.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/openldap/sbin/slapd/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/external/bsd/openldap/lib/slapd

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Tue Dec 28 17:06:05 UTC 2021

Added Files:
src/external/bsd/openldap/lib/slapd: Makefile.inc

Log Message:
for openldap.mk


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/external/bsd/openldap/lib/slapd/Makefile.inc

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Added files:

Index: src/external/bsd/openldap/lib/slapd/Makefile.inc
diff -u /dev/null src/external/bsd/openldap/lib/slapd/Makefile.inc:1.1
--- /dev/null	Tue Dec 28 12:06:05 2021
+++ src/external/bsd/openldap/lib/slapd/Makefile.inc	Tue Dec 28 12:06:05 2021
@@ -0,0 +1,3 @@
+#	$NetBSD: Makefile.inc,v 1.1 2021/12/28 17:06:05 christos Exp $
+
+.include "../../openldap.mk"

CVS commit: src/external/bsd/openldap/lib/slapd

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Tue Dec 28 17:06:05 UTC 2021

Added Files:
src/external/bsd/openldap/lib/slapd: Makefile.inc

Log Message:
for openldap.mk


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/external/bsd/openldap/lib/slapd/Makefile.inc

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/external/bsd/openldap

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Tue Dec 28 17:05:44 UTC 2021

Modified Files:
src/external/bsd/openldap/include: portable.h
src/external/bsd/openldap/lib: Makefile
Added Files:
src/external/bsd/openldap/lib/slapd: Makefile
src/external/bsd/openldap/lib/slapd/back-ldif: Makefile
src/external/bsd/openldap/lib/slapd/back-mdb: Makefile
src/external/bsd/openldap/lib/slapd/back-monitor: Makefile
src/external/bsd/openldap/lib/slapd/back-relay: Makefile
src/external/bsd/openldap/lib/slapd/overlays: Makefile statover.c
src/external/bsd/openldap/sbin: Makefile.inc
src/external/bsd/openldap/sbin/slapd: Makefile backends.c

Log Message:
Add slapd WIP.


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/external/bsd/openldap/include/portable.h
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/openldap/lib/Makefile
cvs rdiff -u -r0 -r1.1 src/external/bsd/openldap/lib/slapd/Makefile
cvs rdiff -u -r0 -r1.1 src/external/bsd/openldap/lib/slapd/back-ldif/Makefile
cvs rdiff -u -r0 -r1.1 src/external/bsd/openldap/lib/slapd/back-mdb/Makefile
cvs rdiff -u -r0 -r1.1 \
src/external/bsd/openldap/lib/slapd/back-monitor/Makefile
cvs rdiff -u -r0 -r1.1 \
src/external/bsd/openldap/lib/slapd/back-relay/Makefile
cvs rdiff -u -r0 -r1.1 src/external/bsd/openldap/lib/slapd/overlays/Makefile \
src/external/bsd/openldap/lib/slapd/overlays/statover.c
cvs rdiff -u -r0 -r1.1 src/external/bsd/openldap/sbin/Makefile.inc
cvs rdiff -u -r0 -r1.1 src/external/bsd/openldap/sbin/slapd/Makefile \
src/external/bsd/openldap/sbin/slapd/backends.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/openldap/include/portable.h
diff -u src/external/bsd/openldap/include/portable.h:1.9 src/external/bsd/openldap/include/portable.h:1.10
--- src/external/bsd/openldap/include/portable.h:1.9	Tue Aug 11 09:15:43 2020
+++ src/external/bsd/openldap/include/portable.h	Tue Dec 28 12:05:43 2021
@@ -359,7 +359,7 @@
 #define HAVE_MKTEMP 1
 
 /* define this if you have mkversion */
-#define HAVE_MKVERSION 1
+#undef HAVE_MKVERSION
 
 /* define if you have MozNSS */
 /* #undef HAVE_MOZNSS */

Index: src/external/bsd/openldap/lib/Makefile
diff -u src/external/bsd/openldap/lib/Makefile:1.1 src/external/bsd/openldap/lib/Makefile:1.2
--- src/external/bsd/openldap/lib/Makefile:1.1	Thu May 22 09:57:47 2008
+++ src/external/bsd/openldap/lib/Makefile	Tue Dec 28 12:05:43 2021
@@ -1,5 +1,5 @@
-#	$NetBSD: Makefile,v 1.1 2008/05/22 13:57:47 lukem Exp $
+#	$NetBSD: Makefile,v 1.2 2021/12/28 17:05:43 christos Exp $
 
-SUBDIR=	liblber .WAIT libldap libldap_r liblutil 
+SUBDIR=	liblber .WAIT libldap libldap_r liblutil # librewrite liblunicode slapd
 
 .include 

Added files:

Index: src/external/bsd/openldap/lib/slapd/Makefile
diff -u /dev/null src/external/bsd/openldap/lib/slapd/Makefile:1.1
--- /dev/null	Tue Dec 28 12:05:44 2021
+++ src/external/bsd/openldap/lib/slapd/Makefile	Tue Dec 28 12:05:44 2021
@@ -0,0 +1,5 @@
+# $NetBSD: Makefile,v 1.1 2021/12/28 17:05:44 christos Exp $
+
+SUBDIR= back-ldif back-mdb back-monitor back-relay overlays
+
+.include 

Index: src/external/bsd/openldap/lib/slapd/back-ldif/Makefile
diff -u /dev/null src/external/bsd/openldap/lib/slapd/back-ldif/Makefile:1.1
--- /dev/null	Tue Dec 28 12:05:44 2021
+++ src/external/bsd/openldap/lib/slapd/back-ldif/Makefile	Tue Dec 28 12:05:44 2021
@@ -0,0 +1,19 @@
+# $NetBSD: Makefile,v 1.1 2021/12/28 17:05:44 christos Exp $
+
+USE_FORT=yes
+LIBISPRIVATE=yes
+
+.include 
+
+LIB=back_ldif
+
+SLAPD= ${LDAP_DISTDIR}/servers/slapd
+BACK_LDIF=${SLAPD}/back-ldif
+.PATH: ${BACK_LDIF}
+
+CPPFLAGS+=-I${SLAPD} -I${BACK_LDIF}
+
+SRCS += \
+	ldif.c version.c
+
+.include 

Index: src/external/bsd/openldap/lib/slapd/back-mdb/Makefile
diff -u /dev/null src/external/bsd/openldap/lib/slapd/back-mdb/Makefile:1.1
--- /dev/null	Tue Dec 28 12:05:45 2021
+++ src/external/bsd/openldap/lib/slapd/back-mdb/Makefile	Tue Dec 28 12:05:44 2021
@@ -0,0 +1,26 @@
+# $NetBSD: Makefile,v 1.1 2021/12/28 17:05:44 christos Exp $
+
+USE_FORT=yes
+LIBISPRIVATE=yes
+
+.include 
+
+LIB=back_mdb
+
+SLAPD= ${LDAP_DISTDIR}/servers/slapd
+BACK_MDB=${SLAPD}/back-mdb
+LMDB=${LDAP_DISTDIR}/libraries/liblmdb
+
+.PATH: ${BACK_MDB} ${LMDB}
+
+COPTS.mdb.c += -Wno-error=stringop-overflow
+
+CPPFLAGS+=-I${SLAPD} -I${BACK_MDB} -I${LMDB}
+
+SRCS += \
+	add.c delete.c id2entry.c mdb.c nextid.c attr.c dn2entry.c \
+	idl.c midl.c operational.c bind.c dn2id.c index.c modify.c \
+	search.c compare.c extended.c init.c modrdn.c tools.c \
+	config.c filterindex.c key.c monitor.c version.c \
+
+.include 

Index: src/external/bsd/openldap/lib/slapd/back-monitor/Makefile
diff -u /dev/null src/external/bsd/openldap/lib/slapd/back-monitor/Makefile:1.1
--- /dev/null	Tue Dec 28 12:05:45 2021
+++ src/external/bsd/openldap/lib/slapd/back-monitor/Makefile	Tue Dec 28 

CVS commit: src/external/bsd/openldap

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Tue Dec 28 17:05:44 UTC 2021

Modified Files:
src/external/bsd/openldap/include: portable.h
src/external/bsd/openldap/lib: Makefile
Added Files:
src/external/bsd/openldap/lib/slapd: Makefile
src/external/bsd/openldap/lib/slapd/back-ldif: Makefile
src/external/bsd/openldap/lib/slapd/back-mdb: Makefile
src/external/bsd/openldap/lib/slapd/back-monitor: Makefile
src/external/bsd/openldap/lib/slapd/back-relay: Makefile
src/external/bsd/openldap/lib/slapd/overlays: Makefile statover.c
src/external/bsd/openldap/sbin: Makefile.inc
src/external/bsd/openldap/sbin/slapd: Makefile backends.c

Log Message:
Add slapd WIP.


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/external/bsd/openldap/include/portable.h
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/openldap/lib/Makefile
cvs rdiff -u -r0 -r1.1 src/external/bsd/openldap/lib/slapd/Makefile
cvs rdiff -u -r0 -r1.1 src/external/bsd/openldap/lib/slapd/back-ldif/Makefile
cvs rdiff -u -r0 -r1.1 src/external/bsd/openldap/lib/slapd/back-mdb/Makefile
cvs rdiff -u -r0 -r1.1 \
src/external/bsd/openldap/lib/slapd/back-monitor/Makefile
cvs rdiff -u -r0 -r1.1 \
src/external/bsd/openldap/lib/slapd/back-relay/Makefile
cvs rdiff -u -r0 -r1.1 src/external/bsd/openldap/lib/slapd/overlays/Makefile \
src/external/bsd/openldap/lib/slapd/overlays/statover.c
cvs rdiff -u -r0 -r1.1 src/external/bsd/openldap/sbin/Makefile.inc
cvs rdiff -u -r0 -r1.1 src/external/bsd/openldap/sbin/slapd/Makefile \
src/external/bsd/openldap/sbin/slapd/backends.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/external/bsd/openldap/lib/liblunicode

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Tue Dec 28 17:05:23 UTC 2021

Modified Files:
src/external/bsd/openldap/lib/liblunicode: Makefile
Added Files:
src/external/bsd/openldap/lib/liblunicode/ucgendat: Makefile

Log Message:
remove tools support, not needed, but add the ugcendat Makefile


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/openldap/lib/liblunicode/Makefile
cvs rdiff -u -r0 -r1.1 \
src/external/bsd/openldap/lib/liblunicode/ucgendat/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/openldap/lib/liblunicode/Makefile
diff -u src/external/bsd/openldap/lib/liblunicode/Makefile:1.1 src/external/bsd/openldap/lib/liblunicode/Makefile:1.2
--- src/external/bsd/openldap/lib/liblunicode/Makefile:1.1	Tue Dec 28 12:04:18 2021
+++ src/external/bsd/openldap/lib/liblunicode/Makefile	Tue Dec 28 12:05:23 2021
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 2021/12/28 17:04:18 christos Exp $
+#	$NetBSD: Makefile,v 1.2 2021/12/28 17:05:23 christos Exp $
 
 USE_FORT?=	yes
 
@@ -14,29 +14,4 @@ CPPFLAGS+=	-I${LIBLUNICODE} -I${LIBLUNIC
 
 SRCS+= ucdata.c ure.c urestubs.c ucstr.c
 
-
-.if ${USETOOLS} != "yes"
-UCGENDATOBJ!= cd ${.CURDIR}/ucgendat && ${PRINTOBJDIR}
-TOOL_UCGENDAT=   ${UCGENDATDIR}/ucgendat
-
-.PHONY: ucgendat
-includes:   ucgendat
-SUBDIR= ucgendat
-
-ucgendat:
-	@cd ${.CURDIR}/ucgendat && ${MAKE}
-.endif
-
-uctable.h: ${TOOL_UCGENDAT} ${LIBLUNICODE}/UnicodeData.txt ${LIBLUNICODE}/CompositionExclusions.txt
-	${_MKTARGET_CREATE}
-	${TOOL_UCGENDAT} ${LIBLUNICODE}/UnicodeData.txt \
-	-x ${LIBLUNICODE}/CompositionExclusions.txt
-
-ucdata.c: uctable.h
-.endif
-
-
 .include 
-.if ${USETOOLS} != "yes"
-.include 
-.endif

Added files:

Index: src/external/bsd/openldap/lib/liblunicode/ucgendat/Makefile
diff -u /dev/null src/external/bsd/openldap/lib/liblunicode/ucgendat/Makefile:1.1
--- /dev/null	Tue Dec 28 12:05:23 2021
+++ src/external/bsd/openldap/lib/liblunicode/ucgendat/Makefile	Tue Dec 28 12:05:23 2021
@@ -0,0 +1,22 @@
+# $NetBSD: Makefile,v 1.1 2021/12/28 17:05:23 christos Exp $
+
+.include 
+.include <${.CURDIR}/../../../openldap.mk>
+
+.PATH:	${LDAP_DISTDIR}/libraries/liblunicode/ucdata
+
+PROG= ucgendat
+
+SRCS+=	ucgendat.c
+
+CPPFLAGS+=\
+	-I${LDAP_SRCDIR}/include	\
+	-I${LDAP_DISTDIR}/include	\
+	'-Dlutil_progname(a,b,c)=__UNCONST(getprogname())'
+
+HOST_CPPFLAGS+= ${CPPFLAGS}
+
+.ifndef HOSTPROG
+HOSTPROG=	${PROG}
+.include 
+.endif

CVS commit: src/external/bsd/openldap/lib/liblunicode

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Tue Dec 28 17:05:23 UTC 2021

Modified Files:
src/external/bsd/openldap/lib/liblunicode: Makefile
Added Files:
src/external/bsd/openldap/lib/liblunicode/ucgendat: Makefile

Log Message:
remove tools support, not needed, but add the ugcendat Makefile


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/openldap/lib/liblunicode/Makefile
cvs rdiff -u -r0 -r1.1 \
src/external/bsd/openldap/lib/liblunicode/ucgendat/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/external/bsd/openldap/lib/liblunicode

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Tue Dec 28 17:04:18 UTC 2021

Added Files:
src/external/bsd/openldap/lib/liblunicode: Makefile

Log Message:
Commit a Makefile with tools support


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/external/bsd/openldap/lib/liblunicode/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Added files:

Index: src/external/bsd/openldap/lib/liblunicode/Makefile
diff -u /dev/null src/external/bsd/openldap/lib/liblunicode/Makefile:1.1
--- /dev/null	Tue Dec 28 12:04:18 2021
+++ src/external/bsd/openldap/lib/liblunicode/Makefile	Tue Dec 28 12:04:18 2021
@@ -0,0 +1,42 @@
+#	$NetBSD: Makefile,v 1.1 2021/12/28 17:04:18 christos Exp $
+
+USE_FORT?=	yes
+
+LIBISPRIVATE=	yes
+
+.include "../../openldap.mk"
+
+LIB=		lunicode
+
+LIBLUNICODE=${LDAP_DISTDIR}/libraries/liblunicode
+.PATH:		${LIBLUNICODE} ${LIBLUNICODE}/ucdata ${LIBLUNICODE}/ure
+CPPFLAGS+=	-I${LIBLUNICODE} -I${LIBLUNICODE}/ucdata -I.
+
+SRCS+= ucdata.c ure.c urestubs.c ucstr.c
+
+
+.if ${USETOOLS} != "yes"
+UCGENDATOBJ!= cd ${.CURDIR}/ucgendat && ${PRINTOBJDIR}
+TOOL_UCGENDAT=   ${UCGENDATDIR}/ucgendat
+
+.PHONY: ucgendat
+includes:   ucgendat
+SUBDIR= ucgendat
+
+ucgendat:
+	@cd ${.CURDIR}/ucgendat && ${MAKE}
+.endif
+
+uctable.h: ${TOOL_UCGENDAT} ${LIBLUNICODE}/UnicodeData.txt ${LIBLUNICODE}/CompositionExclusions.txt
+	${_MKTARGET_CREATE}
+	${TOOL_UCGENDAT} ${LIBLUNICODE}/UnicodeData.txt \
+	-x ${LIBLUNICODE}/CompositionExclusions.txt
+
+ucdata.c: uctable.h
+.endif
+
+
+.include 
+.if ${USETOOLS} != "yes"
+.include 
+.endif

CVS commit: src/external/bsd/openldap/lib/liblunicode

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Tue Dec 28 17:04:18 UTC 2021

Added Files:
src/external/bsd/openldap/lib/liblunicode: Makefile

Log Message:
Commit a Makefile with tools support


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/external/bsd/openldap/lib/liblunicode/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/external/bsd/openldap/lib/libldap

[David A. Holland]

Module Name:src
Committed By:   dholland
Date:   Mon Sep 13 01:12:36 UTC 2021

Modified Files:
src/external/bsd/openldap/lib/libldap: Makefile.libldap

Log Message:
Fix broken build with MKKERBEROS=no


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 \
src/external/bsd/openldap/lib/libldap/Makefile.libldap

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/openldap/lib/libldap/Makefile.libldap
diff -u src/external/bsd/openldap/lib/libldap/Makefile.libldap:1.12 src/external/bsd/openldap/lib/libldap/Makefile.libldap:1.13
--- src/external/bsd/openldap/lib/libldap/Makefile.libldap:1.12	Sun Aug 15 10:33:58 2021
+++ src/external/bsd/openldap/lib/libldap/Makefile.libldap	Mon Sep 13 01:12:36 2021
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.libldap,v 1.12 2021/08/15 10:33:58 christos Exp $
+#	$NetBSD: Makefile.libldap,v 1.13 2021/09/13 01:12:36 dholland Exp $
 
 .include "../../openldap.mk"
 
@@ -20,7 +20,7 @@ SRCS+=		bind.c open.c result.c error.c c
 
 SRCS+=		tls2.c tls_o.c tls_g.c
 
-CPPFLAGS+=	-DLDAP_LIBRARY -DHAVE_GSSAPI
+CPPFLAGS+=	-DLDAP_LIBRARY
 
 LIBDPLIBS+=	lber	${.CURDIR}/../liblber
 

CVS commit: src/external/bsd/openldap/lib/libldap

[David A. Holland]

Module Name:src
Committed By:   dholland
Date:   Mon Sep 13 01:12:36 UTC 2021

Modified Files:
src/external/bsd/openldap/lib/libldap: Makefile.libldap

Log Message:
Fix broken build with MKKERBEROS=no


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 \
src/external/bsd/openldap/lib/libldap/Makefile.libldap

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/external/bsd/openldap/dist/libraries/libldap

[Roland Illig]

Module Name:src
Committed By:   rillig
Date:   Mon Sep  6 17:34:33 UTC 2021

Modified Files:
src/external/bsd/openldap/dist/libraries/libldap: tls2.c

Log Message:
libldap: fix undefined behavior in ldap_int_tls_connect

The function isdigit must not be called with 'char' as argument.

https://bugs.openldap.org/show_bug.cgi?id=9668


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/external/bsd/openldap/dist/libraries/libldap/tls2.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/openldap/dist/libraries/libldap/tls2.c
diff -u src/external/bsd/openldap/dist/libraries/libldap/tls2.c:1.3 src/external/bsd/openldap/dist/libraries/libldap/tls2.c:1.4
--- src/external/bsd/openldap/dist/libraries/libldap/tls2.c:1.3	Sat Aug 14 16:14:56 2021
+++ src/external/bsd/openldap/dist/libraries/libldap/tls2.c	Mon Sep  6 17:34:33 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: tls2.c,v 1.3 2021/08/14 16:14:56 christos Exp $	*/
+/*	$NetBSD: tls2.c,v 1.4 2021/09/06 17:34:33 rillig Exp $	*/
 
 /* tls.c - Handle tls/ssl. */
 /* $OpenLDAP$ */
@@ -19,7 +19,7 @@
  */
 
 #include 
-__RCSID("$NetBSD: tls2.c,v 1.3 2021/08/14 16:14:56 christos Exp $");
+__RCSID("$NetBSD: tls2.c,v 1.4 2021/09/06 17:34:33 rillig Exp $");
 
 #include "portable.h"
 #include "ldap_config.h"
@@ -396,7 +396,7 @@ ldap_int_tls_connect( LDAP *ld, LDAPConn
 break;
 			if ( *c == '.' )
 continue;
-			if ( !isdigit( *c )) {
+			if ( !isdigit( (unsigned char)*c )) {
 numeric = 0;
 break;
 			}

CVS commit: src/external/bsd/openldap/dist/libraries/libldap

[Roland Illig]

Module Name:src
Committed By:   rillig
Date:   Mon Sep  6 17:34:33 UTC 2021

Modified Files:
src/external/bsd/openldap/dist/libraries/libldap: tls2.c

Log Message:
libldap: fix undefined behavior in ldap_int_tls_connect

The function isdigit must not be called with 'char' as argument.

https://bugs.openldap.org/show_bug.cgi?id=9668


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/external/bsd/openldap/dist/libraries/libldap/tls2.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/external/bsd/openldap/dist/libraries/libldap

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Thu Aug 19 12:13:37 UTC 2021

Modified Files:
src/external/bsd/openldap/dist/libraries/libldap: gssapi.c

Log Message:
Fix debugging formats


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
src/external/bsd/openldap/dist/libraries/libldap/gssapi.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/openldap/dist/libraries/libldap/gssapi.c
diff -u src/external/bsd/openldap/dist/libraries/libldap/gssapi.c:1.4 src/external/bsd/openldap/dist/libraries/libldap/gssapi.c:1.5
--- src/external/bsd/openldap/dist/libraries/libldap/gssapi.c:1.4	Sat Aug 14 12:15:46 2021
+++ src/external/bsd/openldap/dist/libraries/libldap/gssapi.c	Thu Aug 19 08:13:37 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: gssapi.c,v 1.4 2021/08/14 16:15:46 christos Exp $	*/
+/*	$NetBSD: gssapi.c,v 1.5 2021/08/19 12:13:37 christos Exp $	*/
 
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software .
@@ -18,7 +18,7 @@
  */
 
 #include 
-__RCSID("$NetBSD: gssapi.c,v 1.4 2021/08/14 16:15:46 christos Exp $");
+__RCSID("$NetBSD: gssapi.c,v 1.5 2021/08/19 12:13:37 christos Exp $");
 
 #include "portable.h"
 
@@ -137,10 +137,11 @@ sb_sasl_gssapi_init(
 	if ( gss_rc != GSS_S_COMPLETE ) {
 		char msg[256];
 		ber_log_printf( LDAP_DEBUG_ANY, p->sbiod->sbiod_sb->sb_debug,
-"sb_sasl_gssapi_init: failed to wrap size limit: %s\n",
+"%s: failed to wrap size limit: %s\n", __func__,
 gsserrstr( msg, sizeof(msg), ctx_mech, gss_rc, minor_status ) );
 		ber_log_printf( LDAP_DEBUG_ANY, p->sbiod->sbiod_sb->sb_debug,
-"sb_sasl_gssapi_init: fallback to default wrap size limit\n");
+"%s: fallback to default wrap size limit\n",
+__func__);
 		/*
 		 * some libgssglue/libgssapi versions
 		 * have a broken gss_wrap_size_limit()
@@ -196,14 +197,15 @@ sb_sasl_gssapi_encode(
 	if ( gss_rc != GSS_S_COMPLETE ) {
 		char msg[256];
 		ber_log_printf( LDAP_DEBUG_ANY, p->sbiod->sbiod_sb->sb_debug,
-"sb_sasl_gssapi_encode: failed to encode packet: %s\n",
+"%s: failed to encode packet: %s\n", __func__,
 gsserrstr( msg, sizeof(msg), ctx_mech, gss_rc, minor_status ) );
 		return -1;
 	}
 
 	if ( conf_req_flag && conf_state == 0 ) {
 		ber_log_printf( LDAP_DEBUG_ANY, p->sbiod->sbiod_sb->sb_debug,
-"sb_sasl_gssapi_encode: GSS_C_CONF_FLAG was ignored by our gss_wrap()\n" );
+"%s: GSS_C_CONF_FLAG was ignored by our gss_wrap()\n",
+__func__);
 		return -1;
 	}
 
@@ -214,8 +216,8 @@ sb_sasl_gssapi_encode(
 		ber_pvt_sb_grow_buffer( dst, pkt_len ) < 0 )
 	{
 		ber_log_printf( LDAP_DEBUG_ANY, p->sbiod->sbiod_sb->sb_debug,
-"sb_sasl_gssapi_encode: failed to grow the buffer to %lu bytes\n",
-pkt_len );
+"%s: failed to grow the buffer to %lu bytes\n",
+__func__, pkt_len );
 		return -1;
 	}
 
@@ -275,14 +277,15 @@ sb_sasl_gssapi_decode(
 	if ( gss_rc != GSS_S_COMPLETE ) {
 		char msg[256];
 		ber_log_printf( LDAP_DEBUG_ANY, p->sbiod->sbiod_sb->sb_debug,
-"sb_sasl_gssapi_decode: failed to decode packet: %s\n",
+"%s: failed to decode packet: %s\n", __func__,
 gsserrstr( msg, sizeof(msg), ctx_mech, gss_rc, minor_status ) );
 		return -1;
 	}
 
 	if ( conf_req_flag && conf_state == 0 ) {
 		ber_log_printf( LDAP_DEBUG_ANY, p->sbiod->sbiod_sb->sb_debug,
-"sb_sasl_gssapi_encode: GSS_C_CONF_FLAG was ignored by our peer\n" );
+"%s: GSS_C_CONF_FLAG was ignored by our peer\n",
+__func__);
 		return -1;
 	}
 
@@ -291,8 +294,8 @@ sb_sasl_gssapi_decode(
 		ber_pvt_sb_grow_buffer( dst, unwrapped.length ) < 0 )
 	{
 		ber_log_printf( LDAP_DEBUG_ANY, p->sbiod->sbiod_sb->sb_debug,
-"sb_sasl_gssapi_decode: failed to grow the buffer to %lu bytes\n",
-unwrapped.length );
+"%s: failed to grow the buffer to %zu bytes\n",
+__func__, unwrapped.length );
 		return -1;
 	}
 

CVS commit: src/external/bsd/openldap/dist/libraries/libldap

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Thu Aug 19 12:13:37 UTC 2021

Modified Files:
src/external/bsd/openldap/dist/libraries/libldap: gssapi.c

Log Message:
Fix debugging formats


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
src/external/bsd/openldap/dist/libraries/libldap/gssapi.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/external/bsd/openldap/lib/libldap_r

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Tue Aug 17 01:59:16 UTC 2021

Modified Files:
src/external/bsd/openldap/lib/libldap_r: Makefile

Log Message:
add missing tpool.c.  fixes libreoffice build.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/openldap/lib/libldap_r/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/external/bsd/openldap/lib/libldap_r

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Tue Aug 17 01:59:16 UTC 2021

Modified Files:
src/external/bsd/openldap/lib/libldap_r: Makefile

Log Message:
add missing tpool.c.  fixes libreoffice build.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/openldap/lib/libldap_r/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/openldap/lib/libldap_r/Makefile
diff -u src/external/bsd/openldap/lib/libldap_r/Makefile:1.6 src/external/bsd/openldap/lib/libldap_r/Makefile:1.7
--- src/external/bsd/openldap/lib/libldap_r/Makefile:1.6	Sat Aug 14 16:15:04 2021
+++ src/external/bsd/openldap/lib/libldap_r/Makefile	Tue Aug 17 01:59:16 2021
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.6 2021/08/14 16:15:04 christos Exp $
+#	$NetBSD: Makefile,v 1.7 2021/08/17 01:59:16 mrg Exp $
 
 USE_FORT?=	yes
 CWARNFLAGS.clang=	-Wno-format-extra-args
@@ -11,7 +11,7 @@ LIB=		ldap_r
 
 SRCS+=		threads.c rdwr.c rq.c \
 		thr_posix.c thr_thr.c thr_nt.c \
-		thr_pth.c thr_debug.c
+		thr_pth.c thr_debug.c tpool.c
 
 COPTS+=		-pthread
 LIBDPLIBS+=	pthread	${.CURDIR}/../../../../../lib/libpthread

CVS commit: src/external/bsd/openldap/lib/libldap

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sun Aug 15 10:33:58 UTC 2021

Modified Files:
src/external/bsd/openldap/lib/libldap: Makefile.libldap

Log Message:
Conditionalize GSSAPI use on USE_KERBEROS


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 \
src/external/bsd/openldap/lib/libldap/Makefile.libldap

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/external/bsd/openldap/lib/libldap

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sun Aug 15 10:33:58 UTC 2021

Modified Files:
src/external/bsd/openldap/lib/libldap: Makefile.libldap

Log Message:
Conditionalize GSSAPI use on USE_KERBEROS


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 \
src/external/bsd/openldap/lib/libldap/Makefile.libldap

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/openldap/lib/libldap/Makefile.libldap
diff -u src/external/bsd/openldap/lib/libldap/Makefile.libldap:1.11 src/external/bsd/openldap/lib/libldap/Makefile.libldap:1.12
--- src/external/bsd/openldap/lib/libldap/Makefile.libldap:1.11	Sat Aug 14 12:15:03 2021
+++ src/external/bsd/openldap/lib/libldap/Makefile.libldap	Sun Aug 15 06:33:58 2021
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.libldap,v 1.11 2021/08/14 16:15:03 christos Exp $
+#	$NetBSD: Makefile.libldap,v 1.12 2021/08/15 10:33:58 christos Exp $
 
 .include "../../openldap.mk"
 
@@ -24,7 +24,11 @@ CPPFLAGS+=	-DLDAP_LIBRARY -DHAVE_GSSAPI
 
 LIBDPLIBS+=	lber	${.CURDIR}/../liblber
 
+.if ${USE_KERBEROS} != "no"
+CPPFLAGS+=	-DHAVE_GSSAPI
 LIBDPLIBS+=	gssapi	${NETBSDSRCDIR}/crypto/external/bsd/heimdal/lib/libgssapi
+.endif
+
 LIBDPLIBS+=	crypto	${NETBSDSRCDIR}/crypto/external/bsd/${EXTERNAL_OPENSSL_SUBDIR}/lib/libcrypto
 LIBDPLIBS+=	ssl	${NETBSDSRCDIR}/crypto/external/bsd/${EXTERNAL_OPENSSL_SUBDIR}/lib/libssl
 

CVS commit: src/external/bsd/openldap/dist/libraries/libldap

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sat Aug 14 16:15:46 UTC 2021

Added Files:
src/external/bsd/openldap/dist/libraries/libldap: gssapi.c

Log Message:
Put back gssapi.c


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.4 \
src/external/bsd/openldap/dist/libraries/libldap/gssapi.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Added files:

Index: src/external/bsd/openldap/dist/libraries/libldap/gssapi.c
diff -u /dev/null src/external/bsd/openldap/dist/libraries/libldap/gssapi.c:1.4
--- /dev/null	Sat Aug 14 12:15:46 2021
+++ src/external/bsd/openldap/dist/libraries/libldap/gssapi.c	Sat Aug 14 12:15:46 2021
@@ -0,0 +1,1015 @@
+/*	$NetBSD: gssapi.c,v 1.4 2021/08/14 16:15:46 christos Exp $	*/
+
+/* $OpenLDAP$ */
+/* This work is part of OpenLDAP Software .
+ *
+ * Copyright 1998-2020 The OpenLDAP Foundation.
+ * All rights reserved.
+ *
+ * Author: Stefan Metzmacher 
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * .
+ */
+
+#include 
+__RCSID("$NetBSD: gssapi.c,v 1.4 2021/08/14 16:15:46 christos Exp $");
+
+#include "portable.h"
+
+#include 
+
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+
+#ifdef HAVE_LIMITS_H
+#include 
+#endif
+
+#include "ldap-int.h"
+
+#ifdef HAVE_GSSAPI
+
+#ifdef HAVE_GSSAPI_GSSAPI_H
+#include 
+#else
+#include 
+#endif
+
+static char *
+gsserrstr(
+	char *buf,
+	ber_len_t buf_len,
+	gss_OID mech,
+	int gss_rc,
+	OM_uint32 minor_status )
+{
+	OM_uint32 min2;
+	gss_buffer_desc mech_msg = GSS_C_EMPTY_BUFFER;
+	gss_buffer_desc gss_msg = GSS_C_EMPTY_BUFFER;
+	gss_buffer_desc minor_msg = GSS_C_EMPTY_BUFFER;
+	OM_uint32 msg_ctx = 0;
+
+	if (buf == NULL) {
+		return NULL;
+	}
+
+	if (buf_len == 0) {
+		return NULL;
+	}
+
+#ifdef HAVE_GSS_OID_TO_STR
+	gss_oid_to_str(, mech, _msg);
+#endif
+	gss_display_status(, gss_rc, GSS_C_GSS_CODE,
+			   mech, _ctx, _msg);
+	gss_display_status(, minor_status, GSS_C_MECH_CODE,
+			   mech, _ctx, _msg);
+
+	snprintf(buf, buf_len, "gss_rc[%d:%*s] mech[%*s] minor[%u:%*s]",
+		 gss_rc, (int)gss_msg.length,
+		 (const char *)(gss_msg.value?gss_msg.value:""),
+		 (int)mech_msg.length,
+		 (const char *)(mech_msg.value?mech_msg.value:""),
+		 minor_status, (int)minor_msg.length,
+		 (const char *)(minor_msg.value?minor_msg.value:""));
+
+	gss_release_buffer(, _msg);
+	gss_release_buffer(, _msg);
+	gss_release_buffer(, _msg);
+
+	buf[buf_len-1] = '\0';
+
+	return buf;
+}
+
+static void
+sb_sasl_gssapi_init(
+	struct sb_sasl_generic_data *p,
+	ber_len_t *min_send,
+	ber_len_t *max_send,
+	ber_len_t *max_recv )
+{
+	gss_ctx_id_t gss_ctx = (gss_ctx_id_t)p->ops_private;
+	int gss_rc;
+	OM_uint32 minor_status;
+	gss_OID ctx_mech = GSS_C_NO_OID;
+	OM_uint32 ctx_flags = 0;
+	int conf_req_flag = 0;
+	OM_uint32 max_input_size;
+
+	gss_inquire_context(_status,
+			gss_ctx,
+			NULL,
+			NULL,
+			NULL,
+			_mech,
+			_flags,
+			NULL,
+			NULL);
+
+	if (ctx_flags & (GSS_C_CONF_FLAG)) {
+		conf_req_flag = 1;
+	}
+
+#if defined(HAVE_CYRUS_SASL)
+#define SEND_PREALLOC_SIZE	SASL_MIN_BUFF_SIZE
+#else
+#define SEND_PREALLOC_SIZE  4096
+#endif
+#define SEND_MAX_WIRE_SIZE	0x00A0
+#define RECV_MAX_WIRE_SIZE	0x0FFF
+#define FALLBACK_SEND_MAX_SIZE	0x009FFFB8 /* from MIT 1.5.x */
+
+	gss_rc = gss_wrap_size_limit(_status, gss_ctx,
+ conf_req_flag, GSS_C_QOP_DEFAULT,
+ SEND_MAX_WIRE_SIZE, _input_size);
+	if ( gss_rc != GSS_S_COMPLETE ) {
+		char msg[256];
+		ber_log_printf( LDAP_DEBUG_ANY, p->sbiod->sbiod_sb->sb_debug,
+"sb_sasl_gssapi_init: failed to wrap size limit: %s\n",
+gsserrstr( msg, sizeof(msg), ctx_mech, gss_rc, minor_status ) );
+		ber_log_printf( LDAP_DEBUG_ANY, p->sbiod->sbiod_sb->sb_debug,
+"sb_sasl_gssapi_init: fallback to default wrap size limit\n");
+		/*
+		 * some libgssglue/libgssapi versions
+		 * have a broken gss_wrap_size_limit()
+		 * implementation
+		 */
+		max_input_size = FALLBACK_SEND_MAX_SIZE;
+	}
+
+	*min_send = SEND_PREALLOC_SIZE;
+	*max_send = max_input_size;
+	*max_recv = RECV_MAX_WIRE_SIZE;
+}
+
+static ber_int_t
+sb_sasl_gssapi_encode(
+	struct sb_sasl_generic_data *p,
+	unsigned char *buf,
+	ber_len_t len,
+	Sockbuf_Buf *dst )
+{
+	gss_ctx_id_t gss_ctx = (gss_ctx_id_t)p->ops_private;
+	int gss_rc;
+	OM_uint32 minor_status;
+	gss_buffer_desc unwrapped, wrapped;
+	gss_OID ctx_mech = GSS_C_NO_OID;
+	OM_uint32 ctx_flags = 0;
+	int conf_req_flag = 0;
+	int conf_state;
+	unsigned char *b;
+	ber_len_t pkt_len;
+
+	unwrapped.value		= buf;
+	unwrapped.length	= len;
+
+	gss_inquire_context(_status,
+			gss_ctx,
+			NULL,
+			

CVS commit: src/external/bsd/openldap/dist/libraries/libldap

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sat Aug 14 16:15:46 UTC 2021

Added Files:
src/external/bsd/openldap/dist/libraries/libldap: gssapi.c

Log Message:
Put back gssapi.c


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.4 \
src/external/bsd/openldap/dist/libraries/libldap/gssapi.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/external/bsd/openldap

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sat Aug 14 16:15:04 UTC 2021

Modified Files:
src/external/bsd/openldap: openldap.mk
src/external/bsd/openldap/bin: Makefile.inc
src/external/bsd/openldap/dist/build: mkversion version.h
src/external/bsd/openldap/dist/clients/tools: common.c common.h
ldapcompare.c ldapdelete.c ldapexop.c ldapmodify.c ldapmodrdn.c
ldappasswd.c ldapsearch.c ldapurl.c ldapvc.c ldapwhoami.c
src/external/bsd/openldap/dist/contrib/ldapc++/src: LDAPAddRequest.h
LDAPAsynConnection.h LDAPAttrType.h LDAPAttribute.h
LDAPAttributeList.h LDAPBindRequest.h LDAPCompareRequest.h
LDAPConnection.h LDAPConstraints.h LDAPControl.h LDAPControlSet.h
LDAPDeleteRequest.h LDAPEntry.h LDAPEntryList.h LDAPException.h
LDAPExtRequest.h LDAPExtResult.h LDAPMessage.h LDAPMessageQueue.h
LDAPModDNRequest.h LDAPModList.h LDAPModification.h
LDAPModifyRequest.h LDAPObjClass.h LDAPRebind.h LDAPRebindAuth.h
LDAPReferenceList.h LDAPRequest.h LDAPResult.h LDAPSaslBindResult.h
LDAPSchema.h LDAPSearchReference.h LDAPSearchRequest.h
LDAPSearchResult.h LDAPSearchResults.h LDAPUrl.h LDAPUrlList.h
LdifReader.h LdifWriter.h SaslInteraction.h
SaslInteractionHandler.h StringList.h TlsOptions.h debug.h
src/external/bsd/openldap/dist/contrib/ldapc++/src/ac: time.h
src/external/bsd/openldap/dist/contrib/ldaptcl: neoXldap.c tclAppInit.c
tkAppInit.c
src/external/bsd/openldap/dist/contrib/slapd-modules/acl: gssacl.c
posixgroup.c
src/external/bsd/openldap/dist/contrib/slapd-modules/addpartial:
addpartial-overlay.c
src/external/bsd/openldap/dist/contrib/slapd-modules/adremap: adremap.c
src/external/bsd/openldap/dist/contrib/slapd-modules/allop: allop.c
src/external/bsd/openldap/dist/contrib/slapd-modules/allowed: allowed.c
src/external/bsd/openldap/dist/contrib/slapd-modules/authzid: authzid.c
src/external/bsd/openldap/dist/contrib/slapd-modules/autogroup:
autogroup.c
src/external/bsd/openldap/dist/contrib/slapd-modules/cloak: cloak.c
src/external/bsd/openldap/dist/contrib/slapd-modules/comp_match: asn.h
asn_to_syn_mr.c authorityKeyIdentifier.c authorityKeyIdentifier.h
certificate.c certificate.h componentlib.c componentlib.h crl.c
crl.h init.c
src/external/bsd/openldap/dist/contrib/slapd-modules/datamorph:
datamorph.c
src/external/bsd/openldap/dist/contrib/slapd-modules/denyop: denyop.c
src/external/bsd/openldap/dist/contrib/slapd-modules/dsaschema:
dsaschema.c
src/external/bsd/openldap/dist/contrib/slapd-modules/dupent: dupent.c
src/external/bsd/openldap/dist/contrib/slapd-modules/kinit: kinit.c
src/external/bsd/openldap/dist/contrib/slapd-modules/lastbind:
lastbind.c
src/external/bsd/openldap/dist/contrib/slapd-modules/lastmod: lastmod.c
src/external/bsd/openldap/dist/contrib/slapd-modules/noopsrch:
noopsrch.c
src/external/bsd/openldap/dist/contrib/slapd-modules/nops: nops.c
src/external/bsd/openldap/dist/contrib/slapd-modules/nssov: alias.c
ether.c group.c host.c netgroup.c network.c nssov.c nssov.h pam.c
passwd.c protocol.c rpc.c service.c shadow.c

src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-pam-ldapd:
attrs.h nslcd-prot.h nslcd.h tio.c tio.h
src/external/bsd/openldap/dist/contrib/slapd-modules/passwd: apr1.c
kerberos.c netscape.c radius.c
src/external/bsd/openldap/dist/contrib/slapd-modules/passwd/pbkdf2:
pw-pbkdf2.c
src/external/bsd/openldap/dist/contrib/slapd-modules/passwd/sha2:
sha2.c sha2.h slapd-sha2.c
src/external/bsd/openldap/dist/contrib/slapd-modules/passwd/totp:
slapd-totp.c
src/external/bsd/openldap/dist/contrib/slapd-modules/ppm: ppm.c ppm.h
ppm_test.c
src/external/bsd/openldap/dist/contrib/slapd-modules/proxyOld:
proxyOld.c
src/external/bsd/openldap/dist/contrib/slapd-modules/rbac: init.c jts.c
ldap_rbac.h rbac.c rbac.h rbacacl.c rbacaudit.c rbacperm.c
rbacreq.c rbacsess.c rbacuser.c util.c
src/external/bsd/openldap/dist/contrib/slapd-modules/samba4: pguid.c
rdnval.c vernum.c
src/external/bsd/openldap/dist/contrib/slapd-modules/smbk5pwd:
smbk5pwd.c
src/external/bsd/openldap/dist/contrib/slapd-modules/trace: trace.c
src/external/bsd/openldap/dist/contrib/slapd-modules/usn: usn.c
src/external/bsd/openldap/dist/contrib/slapd-modules/variant: variant.c
src/external/bsd/openldap/dist/contrib/slapd-modules/vc: vc.c

CVS commit: src/external/bsd/openldap

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sat Aug 14 16:15:04 UTC 2021

Modified Files:
src/external/bsd/openldap: openldap.mk
src/external/bsd/openldap/bin: Makefile.inc
src/external/bsd/openldap/dist/build: mkversion version.h
src/external/bsd/openldap/dist/clients/tools: common.c common.h
ldapcompare.c ldapdelete.c ldapexop.c ldapmodify.c ldapmodrdn.c
ldappasswd.c ldapsearch.c ldapurl.c ldapvc.c ldapwhoami.c
src/external/bsd/openldap/dist/contrib/ldapc++/src: LDAPAddRequest.h
LDAPAsynConnection.h LDAPAttrType.h LDAPAttribute.h
LDAPAttributeList.h LDAPBindRequest.h LDAPCompareRequest.h
LDAPConnection.h LDAPConstraints.h LDAPControl.h LDAPControlSet.h
LDAPDeleteRequest.h LDAPEntry.h LDAPEntryList.h LDAPException.h
LDAPExtRequest.h LDAPExtResult.h LDAPMessage.h LDAPMessageQueue.h
LDAPModDNRequest.h LDAPModList.h LDAPModification.h
LDAPModifyRequest.h LDAPObjClass.h LDAPRebind.h LDAPRebindAuth.h
LDAPReferenceList.h LDAPRequest.h LDAPResult.h LDAPSaslBindResult.h
LDAPSchema.h LDAPSearchReference.h LDAPSearchRequest.h
LDAPSearchResult.h LDAPSearchResults.h LDAPUrl.h LDAPUrlList.h
LdifReader.h LdifWriter.h SaslInteraction.h
SaslInteractionHandler.h StringList.h TlsOptions.h debug.h
src/external/bsd/openldap/dist/contrib/ldapc++/src/ac: time.h
src/external/bsd/openldap/dist/contrib/ldaptcl: neoXldap.c tclAppInit.c
tkAppInit.c
src/external/bsd/openldap/dist/contrib/slapd-modules/acl: gssacl.c
posixgroup.c
src/external/bsd/openldap/dist/contrib/slapd-modules/addpartial:
addpartial-overlay.c
src/external/bsd/openldap/dist/contrib/slapd-modules/adremap: adremap.c
src/external/bsd/openldap/dist/contrib/slapd-modules/allop: allop.c
src/external/bsd/openldap/dist/contrib/slapd-modules/allowed: allowed.c
src/external/bsd/openldap/dist/contrib/slapd-modules/authzid: authzid.c
src/external/bsd/openldap/dist/contrib/slapd-modules/autogroup:
autogroup.c
src/external/bsd/openldap/dist/contrib/slapd-modules/cloak: cloak.c
src/external/bsd/openldap/dist/contrib/slapd-modules/comp_match: asn.h
asn_to_syn_mr.c authorityKeyIdentifier.c authorityKeyIdentifier.h
certificate.c certificate.h componentlib.c componentlib.h crl.c
crl.h init.c
src/external/bsd/openldap/dist/contrib/slapd-modules/datamorph:
datamorph.c
src/external/bsd/openldap/dist/contrib/slapd-modules/denyop: denyop.c
src/external/bsd/openldap/dist/contrib/slapd-modules/dsaschema:
dsaschema.c
src/external/bsd/openldap/dist/contrib/slapd-modules/dupent: dupent.c
src/external/bsd/openldap/dist/contrib/slapd-modules/kinit: kinit.c
src/external/bsd/openldap/dist/contrib/slapd-modules/lastbind:
lastbind.c
src/external/bsd/openldap/dist/contrib/slapd-modules/lastmod: lastmod.c
src/external/bsd/openldap/dist/contrib/slapd-modules/noopsrch:
noopsrch.c
src/external/bsd/openldap/dist/contrib/slapd-modules/nops: nops.c
src/external/bsd/openldap/dist/contrib/slapd-modules/nssov: alias.c
ether.c group.c host.c netgroup.c network.c nssov.c nssov.h pam.c
passwd.c protocol.c rpc.c service.c shadow.c

src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-pam-ldapd:
attrs.h nslcd-prot.h nslcd.h tio.c tio.h
src/external/bsd/openldap/dist/contrib/slapd-modules/passwd: apr1.c
kerberos.c netscape.c radius.c
src/external/bsd/openldap/dist/contrib/slapd-modules/passwd/pbkdf2:
pw-pbkdf2.c
src/external/bsd/openldap/dist/contrib/slapd-modules/passwd/sha2:
sha2.c sha2.h slapd-sha2.c
src/external/bsd/openldap/dist/contrib/slapd-modules/passwd/totp:
slapd-totp.c
src/external/bsd/openldap/dist/contrib/slapd-modules/ppm: ppm.c ppm.h
ppm_test.c
src/external/bsd/openldap/dist/contrib/slapd-modules/proxyOld:
proxyOld.c
src/external/bsd/openldap/dist/contrib/slapd-modules/rbac: init.c jts.c
ldap_rbac.h rbac.c rbac.h rbacacl.c rbacaudit.c rbacperm.c
rbacreq.c rbacsess.c rbacuser.c util.c
src/external/bsd/openldap/dist/contrib/slapd-modules/samba4: pguid.c
rdnval.c vernum.c
src/external/bsd/openldap/dist/contrib/slapd-modules/smbk5pwd:
smbk5pwd.c
src/external/bsd/openldap/dist/contrib/slapd-modules/trace: trace.c
src/external/bsd/openldap/dist/contrib/slapd-modules/usn: usn.c
src/external/bsd/openldap/dist/contrib/slapd-modules/variant: variant.c
src/external/bsd/openldap/dist/contrib/slapd-modules/vc: vc.c

CVS commit: src/external/bsd/openldap

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Tue Aug 11 13:15:43 UTC 2020

Modified Files:
src/external/bsd/openldap: Makefile openldap2netbsd
src/external/bsd/openldap/dist/build: config.guess config.sub mkversion
version.h
src/external/bsd/openldap/dist/clients/tools: common.c common.h
ldapcompare.c ldapdelete.c ldapexop.c ldapmodify.c ldapmodrdn.c
ldappasswd.c ldapsearch.c ldapurl.c ldapwhoami.c
src/external/bsd/openldap/dist/contrib/ldapc++: config.guess config.sub
src/external/bsd/openldap/dist/contrib/ldapc++/src: LDAPAddRequest.h
LDAPAsynConnection.h LDAPAttrType.h LDAPAttribute.h
LDAPAttributeList.h LDAPBindRequest.h LDAPCompareRequest.h
LDAPConnection.h LDAPConstraints.h LDAPControl.h LDAPControlSet.h
LDAPDeleteRequest.h LDAPEntry.h LDAPEntryList.h LDAPException.h
LDAPExtRequest.h LDAPExtResult.h LDAPMessage.h LDAPMessageQueue.h
LDAPModDNRequest.h LDAPModList.h LDAPModification.h
LDAPModifyRequest.h LDAPObjClass.h LDAPRebind.h LDAPRebindAuth.h
LDAPReferenceList.h LDAPRequest.h LDAPResult.h LDAPSaslBindResult.h
LDAPSchema.h LDAPSearchReference.h LDAPSearchRequest.h
LDAPSearchResult.h LDAPSearchResults.h LDAPUrl.h LDAPUrlList.h
LdifReader.h LdifWriter.h SaslInteraction.h
SaslInteractionHandler.h StringList.h TlsOptions.h debug.h
src/external/bsd/openldap/dist/contrib/ldapc++/src/ac: time.h
src/external/bsd/openldap/dist/contrib/slapd-modules/acl: posixgroup.c
src/external/bsd/openldap/dist/contrib/slapd-modules/addpartial:
addpartial-overlay.c
src/external/bsd/openldap/dist/contrib/slapd-modules/allop: allop.c
src/external/bsd/openldap/dist/contrib/slapd-modules/allowed: allowed.c
src/external/bsd/openldap/dist/contrib/slapd-modules/autogroup:
autogroup.c
src/external/bsd/openldap/dist/contrib/slapd-modules/cloak: cloak.c
src/external/bsd/openldap/dist/contrib/slapd-modules/denyop: denyop.c
src/external/bsd/openldap/dist/contrib/slapd-modules/dsaschema:
dsaschema.c
src/external/bsd/openldap/dist/contrib/slapd-modules/dupent: dupent.c
src/external/bsd/openldap/dist/contrib/slapd-modules/kinit: kinit.c
src/external/bsd/openldap/dist/contrib/slapd-modules/lastmod: lastmod.c
src/external/bsd/openldap/dist/contrib/slapd-modules/noopsrch:
noopsrch.c
src/external/bsd/openldap/dist/contrib/slapd-modules/nops: nops.c
src/external/bsd/openldap/dist/contrib/slapd-modules/nssov: alias.c
ether.c group.c host.c netgroup.c network.c nssov.c nssov.h pam.c
passwd.c protocol.c rpc.c service.c shadow.c
src/external/bsd/openldap/dist/contrib/slapd-modules/passwd: kerberos.c
netscape.c radius.c
src/external/bsd/openldap/dist/contrib/slapd-modules/passwd/argon2:
pw-argon2.c
src/external/bsd/openldap/dist/contrib/slapd-modules/passwd/pbkdf2:
pw-pbkdf2.c
src/external/bsd/openldap/dist/contrib/slapd-modules/passwd/sha2:
slapd-sha2.c
src/external/bsd/openldap/dist/contrib/slapd-modules/proxyOld:
proxyOld.c
src/external/bsd/openldap/dist/contrib/slapd-modules/samba4: pguid.c
rdnval.c vernum.c
src/external/bsd/openldap/dist/contrib/slapd-modules/smbk5pwd:
smbk5pwd.c
src/external/bsd/openldap/dist/contrib/slapd-modules/trace: trace.c
src/external/bsd/openldap/dist/contrib/slapi-plugins/addrdnvalues:
addrdnvalues.c
src/external/bsd/openldap/dist/include: Makefile.in avl.h
getopt-compat.h lber.h lber_pvt.h ldap.h ldap_cdefs.h
ldap_defaults.h ldap_int_thread.h ldap_log.h ldap_pvt.h
ldap_pvt_thread.h ldap_pvt_uc.h ldap_queue.h ldap_rq.h
ldap_schema.h ldap_utf8.h ldif.h lutil.h lutil_hash.h lutil_ldap.h
lutil_lockf.h lutil_md5.h lutil_sha1.h openldap.h portable.hin
rewrite.h slapi-plugin.h sysexits-compat.h
src/external/bsd/openldap/dist/include/ac: alloca.h assert.h bytes.h
crypt.h ctype.h dirent.h errno.h fdset.h localize.h param.h regex.h
setproctitle.h signal.h socket.h stdarg.h stdlib.h string.h
sysexits.h syslog.h termios.h time.h unistd.h wait.h
src/external/bsd/openldap/dist/libraries/liblber: assert.c bprint.c
debug.c decode.c dtest.c encode.c etest.c idtest.c io.c lber-int.h
memory.c nt_err.c options.c sockbuf.c stdio.c
src/external/bsd/openldap/dist/libraries/libldap: abandon.c add.c
addentry.c apitest.c assertion.c bind.c cancel.c charray.c
compare.c controls.c cyrus.c dds.c delete.c deref.c dnssrv.c
dntest.c error.c extended.c fetch.c 

CVS commit: src/external/bsd/openldap/lib/libldap

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Wed Oct 16 07:39:19 UTC 2019

Modified Files:
src/external/bsd/openldap/lib/libldap: Makefile.libldap

Log Message:
use GCC_NO_STRINGOP_OVERFLOW for charray.c.

this only affects some platforms.


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 \
src/external/bsd/openldap/lib/libldap/Makefile.libldap

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/openldap/lib/libldap/Makefile.libldap
diff -u src/external/bsd/openldap/lib/libldap/Makefile.libldap:1.9 src/external/bsd/openldap/lib/libldap/Makefile.libldap:1.10
--- src/external/bsd/openldap/lib/libldap/Makefile.libldap:1.9	Sun Feb  4 03:19:52 2018
+++ src/external/bsd/openldap/lib/libldap/Makefile.libldap	Wed Oct 16 07:39:18 2019
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.libldap,v 1.9 2018/02/04 03:19:52 christos Exp $
+#	$NetBSD: Makefile.libldap,v 1.10 2019/10/16 07:39:18 mrg Exp $
 
 .include "../../openldap.mk"
 
@@ -25,3 +25,5 @@ LIBDPLIBS+=	lber	${.CURDIR}/../liblber
 
 LIBDPLIBS+=	crypto	${NETBSDSRCDIR}/crypto/external/bsd/${EXTERNAL_OPENSSL_SUBDIR}/lib/libcrypto
 LIBDPLIBS+=	ssl	${NETBSDSRCDIR}/crypto/external/bsd/${EXTERNAL_OPENSSL_SUBDIR}/lib/libssl
+
+COPTS.charray.c+=	${GCC_NO_STRINGOP_OVERFLOW}

CVS commit: src/external/bsd/openldap/lib/libldap

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Wed Oct 16 07:39:19 UTC 2019

Modified Files:
src/external/bsd/openldap/lib/libldap: Makefile.libldap

Log Message:
use GCC_NO_STRINGOP_OVERFLOW for charray.c.

this only affects some platforms.


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 \
src/external/bsd/openldap/lib/libldap/Makefile.libldap

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/external/bsd/openldap

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Thu Aug  8 13:50:58 UTC 2019

Modified Files:
src/external/bsd/openldap/dist/build: mkversion
src/external/bsd/openldap/dist/clients/tools: common.c
src/external/bsd/openldap/dist/include: Makefile.in ldap_pvt.h
ldap_queue.h portable.hin
src/external/bsd/openldap/dist/libraries/libldap: os-ip.c os-local.c
tls_o.c
src/external/bsd/openldap/dist/libraries/liblutil: detach.c md5.c
passwd.c
src/external/bsd/openldap/dist/libraries/librewrite: session.c
src/external/bsd/openldap/dist/servers/slapd: filter.c
src/external/bsd/openldap/dist/servers/slapd/overlays: deref.c
src/external/bsd/openldap/include: ldap_features.h portable.h
Removed Files:
src/external/bsd/openldap/dist/doc/man/man5: slapd-ldbm.5
src/external/bsd/openldap/dist/tests/scripts:
test058-syncrepl-asymmetric

Log Message:
merge conflicts.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/openldap/dist/build/mkversion
cvs rdiff -u -r1.7 -r1.8 \
src/external/bsd/openldap/dist/clients/tools/common.c
cvs rdiff -u -r1.1.1.6 -r0 \
src/external/bsd/openldap/dist/doc/man/man5/slapd-ldbm.5
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/openldap/dist/include/Makefile.in \
src/external/bsd/openldap/dist/include/portable.hin
cvs rdiff -u -r1.1.1.7 -r1.2 \
src/external/bsd/openldap/dist/include/ldap_pvt.h
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/openldap/dist/include/ldap_queue.h
cvs rdiff -u -r1.8 -r1.9 \
src/external/bsd/openldap/dist/libraries/libldap/os-ip.c
cvs rdiff -u -r1.9 -r1.10 \
src/external/bsd/openldap/dist/libraries/libldap/os-local.c
cvs rdiff -u -r1.6 -r1.7 \
src/external/bsd/openldap/dist/libraries/libldap/tls_o.c
cvs rdiff -u -r1.5 -r1.6 \
src/external/bsd/openldap/dist/libraries/liblutil/detach.c \
src/external/bsd/openldap/dist/libraries/liblutil/md5.c
cvs rdiff -u -r1.6 -r1.7 \
src/external/bsd/openldap/dist/libraries/liblutil/passwd.c
cvs rdiff -u -r1.4 -r1.5 \
src/external/bsd/openldap/dist/libraries/librewrite/session.c
cvs rdiff -u -r1.5 -r1.6 \
src/external/bsd/openldap/dist/servers/slapd/filter.c
cvs rdiff -u -r1.4 -r1.5 \
src/external/bsd/openldap/dist/servers/slapd/overlays/deref.c
cvs rdiff -u -r1.1.1.5 -r0 \
src/external/bsd/openldap/dist/tests/scripts/test058-syncrepl-asymmetric
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/openldap/include/ldap_features.h
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/openldap/include/portable.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/openldap/dist/build/mkversion
diff -u src/external/bsd/openldap/dist/build/mkversion:1.7 src/external/bsd/openldap/dist/build/mkversion:1.8
--- src/external/bsd/openldap/dist/build/mkversion:1.7	Mon Feb  5 20:57:23 2018
+++ src/external/bsd/openldap/dist/build/mkversion	Thu Aug  8 09:50:56 2019
@@ -3,7 +3,7 @@
 # $OpenLDAP$
 ## This work is part of OpenLDAP Software .
 ##
-## Copyright 1998-2017 The OpenLDAP Foundation.
+## Copyright 1998-2019 The OpenLDAP Foundation.
 ## All rights reserved.
 ##
 ## Redistribution and use in source and binary forms, with or without
@@ -50,11 +50,16 @@ if test $# != 1 ; then
 fi
 
 APPLICATION=$1
+#if [ -n "${SOURCE_DATE_EPOCH}" ]; then
+   WHOWHERE="openldap"
+#else
+#   WHOWHERE="$USER@$(uname -n):$(pwd)"
+#fi
 
 cat << __EOF__
 /* This work is part of OpenLDAP Software .
  *
- * Copyright 1998-2017 The OpenLDAP Foundation.
+ * Copyright 1998-2019 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -67,7 +72,7 @@ cat << __EOF__
  */
 
 static const char copyright[] =
-"Copyright 1998-2017 The OpenLDAP Foundation.  All rights reserved.\n"
+"Copyright 1998-2019 The OpenLDAP Foundation.  All rights reserved.\n"
 "COPYING RESTRICTIONS APPLY\n";
 
 $static $const char $SYMBOL[] =

Index: src/external/bsd/openldap/dist/clients/tools/common.c
diff -u src/external/bsd/openldap/dist/clients/tools/common.c:1.7 src/external/bsd/openldap/dist/clients/tools/common.c:1.8
--- src/external/bsd/openldap/dist/clients/tools/common.c:1.7	Mon Feb  5 20:57:23 2018
+++ src/external/bsd/openldap/dist/clients/tools/common.c	Thu Aug  8 09:50:56 2019
@@ -1,10 +1,10 @@
-/*	$NetBSD: common.c,v 1.7 2018/02/06 01:57:23 christos Exp $	*/
+/*	$NetBSD: common.c,v 1.8 2019/08/08 13:50:56 christos Exp $	*/
 
 /* common.c - common routines for the ldap client tools */
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software .
  *
- * Copyright 1998-2017 The OpenLDAP Foundation.
+ * Copyright 1998-2019 The OpenLDAP Foundation.
  * Portions Copyright 2003 Kurt D. Zeilenga.
  * Portions Copyright 2003 IBM Corporation.
  * All rights 

CVS commit: src/external/bsd/openldap

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Thu Aug  8 13:50:58 UTC 2019

Modified Files:
src/external/bsd/openldap/dist/build: mkversion
src/external/bsd/openldap/dist/clients/tools: common.c
src/external/bsd/openldap/dist/include: Makefile.in ldap_pvt.h
ldap_queue.h portable.hin
src/external/bsd/openldap/dist/libraries/libldap: os-ip.c os-local.c
tls_o.c
src/external/bsd/openldap/dist/libraries/liblutil: detach.c md5.c
passwd.c
src/external/bsd/openldap/dist/libraries/librewrite: session.c
src/external/bsd/openldap/dist/servers/slapd: filter.c
src/external/bsd/openldap/dist/servers/slapd/overlays: deref.c
src/external/bsd/openldap/include: ldap_features.h portable.h
Removed Files:
src/external/bsd/openldap/dist/doc/man/man5: slapd-ldbm.5
src/external/bsd/openldap/dist/tests/scripts:
test058-syncrepl-asymmetric

Log Message:
merge conflicts.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/openldap/dist/build/mkversion
cvs rdiff -u -r1.7 -r1.8 \
src/external/bsd/openldap/dist/clients/tools/common.c
cvs rdiff -u -r1.1.1.6 -r0 \
src/external/bsd/openldap/dist/doc/man/man5/slapd-ldbm.5
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/openldap/dist/include/Makefile.in \
src/external/bsd/openldap/dist/include/portable.hin
cvs rdiff -u -r1.1.1.7 -r1.2 \
src/external/bsd/openldap/dist/include/ldap_pvt.h
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/openldap/dist/include/ldap_queue.h
cvs rdiff -u -r1.8 -r1.9 \
src/external/bsd/openldap/dist/libraries/libldap/os-ip.c
cvs rdiff -u -r1.9 -r1.10 \
src/external/bsd/openldap/dist/libraries/libldap/os-local.c
cvs rdiff -u -r1.6 -r1.7 \
src/external/bsd/openldap/dist/libraries/libldap/tls_o.c
cvs rdiff -u -r1.5 -r1.6 \
src/external/bsd/openldap/dist/libraries/liblutil/detach.c \
src/external/bsd/openldap/dist/libraries/liblutil/md5.c
cvs rdiff -u -r1.6 -r1.7 \
src/external/bsd/openldap/dist/libraries/liblutil/passwd.c
cvs rdiff -u -r1.4 -r1.5 \
src/external/bsd/openldap/dist/libraries/librewrite/session.c
cvs rdiff -u -r1.5 -r1.6 \
src/external/bsd/openldap/dist/servers/slapd/filter.c
cvs rdiff -u -r1.4 -r1.5 \
src/external/bsd/openldap/dist/servers/slapd/overlays/deref.c
cvs rdiff -u -r1.1.1.5 -r0 \
src/external/bsd/openldap/dist/tests/scripts/test058-syncrepl-asymmetric
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/openldap/include/ldap_features.h
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/openldap/include/portable.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/external/bsd/openldap/dist

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Tue Feb  6 01:57:24 UTC 2018

Modified Files:
src/external/bsd/openldap/dist/build: mkversion
src/external/bsd/openldap/dist/clients/tools: common.c
src/external/bsd/openldap/dist/include: Makefile.in ldap_queue.h
portable.hin
src/external/bsd/openldap/dist/libraries/libldap: os-ip.c os-local.c
tls_o.c
src/external/bsd/openldap/dist/libraries/liblutil: detach.c md5.c
passwd.c
src/external/bsd/openldap/dist/libraries/librewrite: session.c
src/external/bsd/openldap/dist/servers/slapd: filter.c
src/external/bsd/openldap/dist/servers/slapd/overlays: deref.c
Removed Files:
src/external/bsd/openldap/dist: libtool

Log Message:
merge conflicts


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/openldap/dist/libtool
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/openldap/dist/build/mkversion
cvs rdiff -u -r1.6 -r1.7 \
src/external/bsd/openldap/dist/clients/tools/common.c
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/openldap/dist/include/Makefile.in \
src/external/bsd/openldap/dist/include/portable.hin
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/openldap/dist/include/ldap_queue.h
cvs rdiff -u -r1.7 -r1.8 \
src/external/bsd/openldap/dist/libraries/libldap/os-ip.c
cvs rdiff -u -r1.8 -r1.9 \
src/external/bsd/openldap/dist/libraries/libldap/os-local.c
cvs rdiff -u -r1.5 -r1.6 \
src/external/bsd/openldap/dist/libraries/libldap/tls_o.c
cvs rdiff -u -r1.4 -r1.5 \
src/external/bsd/openldap/dist/libraries/liblutil/detach.c \
src/external/bsd/openldap/dist/libraries/liblutil/md5.c
cvs rdiff -u -r1.5 -r1.6 \
src/external/bsd/openldap/dist/libraries/liblutil/passwd.c
cvs rdiff -u -r1.3 -r1.4 \
src/external/bsd/openldap/dist/libraries/librewrite/session.c
cvs rdiff -u -r1.4 -r1.5 \
src/external/bsd/openldap/dist/servers/slapd/filter.c
cvs rdiff -u -r1.3 -r1.4 \
src/external/bsd/openldap/dist/servers/slapd/overlays/deref.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/openldap/dist/build/mkversion
diff -u src/external/bsd/openldap/dist/build/mkversion:1.6 src/external/bsd/openldap/dist/build/mkversion:1.7
--- src/external/bsd/openldap/dist/build/mkversion:1.6	Wed Feb  8 20:53:50 2017
+++ src/external/bsd/openldap/dist/build/mkversion	Mon Feb  5 20:57:23 2018
@@ -3,7 +3,7 @@
 # $OpenLDAP$
 ## This work is part of OpenLDAP Software .
 ##
-## Copyright 1998-2016 The OpenLDAP Foundation.
+## Copyright 1998-2017 The OpenLDAP Foundation.
 ## All rights reserved.
 ##
 ## Redistribution and use in source and binary forms, with or without
@@ -54,7 +54,7 @@ APPLICATION=$1
 cat << __EOF__
 /* This work is part of OpenLDAP Software .
  *
- * Copyright 1998-2016 The OpenLDAP Foundation.
+ * Copyright 1998-2017 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -67,7 +67,7 @@ cat << __EOF__
  */
 
 static const char copyright[] =
-"Copyright 1998-2016 The OpenLDAP Foundation.  All rights reserved.\n"
+"Copyright 1998-2017 The OpenLDAP Foundation.  All rights reserved.\n"
 "COPYING RESTRICTIONS APPLY\n";
 
 $static $const char $SYMBOL[] =

Index: src/external/bsd/openldap/dist/clients/tools/common.c
diff -u src/external/bsd/openldap/dist/clients/tools/common.c:1.6 src/external/bsd/openldap/dist/clients/tools/common.c:1.7
--- src/external/bsd/openldap/dist/clients/tools/common.c:1.6	Wed Feb  8 20:53:50 2017
+++ src/external/bsd/openldap/dist/clients/tools/common.c	Mon Feb  5 20:57:23 2018
@@ -1,10 +1,10 @@
-/*	$NetBSD: common.c,v 1.6 2017/02/09 01:53:50 christos Exp $	*/
+/*	$NetBSD: common.c,v 1.7 2018/02/06 01:57:23 christos Exp $	*/
 
 /* common.c - common routines for the ldap client tools */
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software .
  *
- * Copyright 1998-2016 The OpenLDAP Foundation.
+ * Copyright 1998-2017 The OpenLDAP Foundation.
  * Portions Copyright 2003 Kurt D. Zeilenga.
  * Portions Copyright 2003 IBM Corporation.
  * All rights reserved.
@@ -25,7 +25,7 @@
  */
 
 #include 
-__RCSID("$NetBSD: common.c,v 1.6 2017/02/09 01:53:50 christos Exp $");
+__RCSID("$NetBSD: common.c,v 1.7 2018/02/06 01:57:23 christos Exp $");
 
 #include "portable.h"
 

Index: src/external/bsd/openldap/dist/include/Makefile.in
diff -u src/external/bsd/openldap/dist/include/Makefile.in:1.6 src/external/bsd/openldap/dist/include/Makefile.in:1.7
--- src/external/bsd/openldap/dist/include/Makefile.in:1.6	Wed Feb  8 20:53:50 2017
+++ src/external/bsd/openldap/dist/include/Makefile.in	Mon Feb  5 20:57:23 2018
@@ -2,7 +2,7 @@
 # $OpenLDAP$
 ## This work is part of OpenLDAP Software .
 ##
-## Copyright 1998-2016 The OpenLDAP 

CVS commit: src/external/bsd/openldap/dist

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Tue Feb  6 01:57:24 UTC 2018

Modified Files:
src/external/bsd/openldap/dist/build: mkversion
src/external/bsd/openldap/dist/clients/tools: common.c
src/external/bsd/openldap/dist/include: Makefile.in ldap_queue.h
portable.hin
src/external/bsd/openldap/dist/libraries/libldap: os-ip.c os-local.c
tls_o.c
src/external/bsd/openldap/dist/libraries/liblutil: detach.c md5.c
passwd.c
src/external/bsd/openldap/dist/libraries/librewrite: session.c
src/external/bsd/openldap/dist/servers/slapd: filter.c
src/external/bsd/openldap/dist/servers/slapd/overlays: deref.c
Removed Files:
src/external/bsd/openldap/dist: libtool

Log Message:
merge conflicts


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/openldap/dist/libtool
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/openldap/dist/build/mkversion
cvs rdiff -u -r1.6 -r1.7 \
src/external/bsd/openldap/dist/clients/tools/common.c
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/openldap/dist/include/Makefile.in \
src/external/bsd/openldap/dist/include/portable.hin
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/openldap/dist/include/ldap_queue.h
cvs rdiff -u -r1.7 -r1.8 \
src/external/bsd/openldap/dist/libraries/libldap/os-ip.c
cvs rdiff -u -r1.8 -r1.9 \
src/external/bsd/openldap/dist/libraries/libldap/os-local.c
cvs rdiff -u -r1.5 -r1.6 \
src/external/bsd/openldap/dist/libraries/libldap/tls_o.c
cvs rdiff -u -r1.4 -r1.5 \
src/external/bsd/openldap/dist/libraries/liblutil/detach.c \
src/external/bsd/openldap/dist/libraries/liblutil/md5.c
cvs rdiff -u -r1.5 -r1.6 \
src/external/bsd/openldap/dist/libraries/liblutil/passwd.c
cvs rdiff -u -r1.3 -r1.4 \
src/external/bsd/openldap/dist/libraries/librewrite/session.c
cvs rdiff -u -r1.4 -r1.5 \
src/external/bsd/openldap/dist/servers/slapd/filter.c
cvs rdiff -u -r1.3 -r1.4 \
src/external/bsd/openldap/dist/servers/slapd/overlays/deref.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/external/bsd/openldap/dist/servers/slapd

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Thu Feb  9 02:20:33 UTC 2017

Modified Files:
src/external/bsd/openldap/dist/servers/slapd: filter.c

Log Message:
resolve conflict


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/external/bsd/openldap/dist/servers/slapd/filter.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/external/bsd/openldap/dist/servers/slapd

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Thu Feb  9 02:20:33 UTC 2017

Modified Files:
src/external/bsd/openldap/dist/servers/slapd: filter.c

Log Message:
resolve conflict


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/external/bsd/openldap/dist/servers/slapd/filter.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/openldap/dist/servers/slapd/filter.c
diff -u src/external/bsd/openldap/dist/servers/slapd/filter.c:1.3 src/external/bsd/openldap/dist/servers/slapd/filter.c:1.4
--- src/external/bsd/openldap/dist/servers/slapd/filter.c:1.3	Wed Feb  8 20:53:51 2017
+++ src/external/bsd/openldap/dist/servers/slapd/filter.c	Wed Feb  8 21:20:33 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: filter.c,v 1.3 2017/02/09 01:53:51 christos Exp $	*/
+/*	$NetBSD: filter.c,v 1.4 2017/02/09 02:20:33 christos Exp $	*/
 
 /* filter.c - routines for parsing and dealing with filters */
 /* $OpenLDAP$ */
@@ -27,7 +27,7 @@
  */
 
 #include 
-__RCSID("$NetBSD: filter.c,v 1.3 2017/02/09 01:53:51 christos Exp $");
+__RCSID("$NetBSD: filter.c,v 1.4 2017/02/09 02:20:33 christos Exp $");
 
 #include "portable.h"
 
@@ -1163,17 +1163,10 @@ get_vrFilter( Operation *op, BerElement 
 void
 vrFilter_free( Operation *op, ValuesReturnFilter *vrf )
 {
-<<< filter.c
-	ValuesReturnFilter	*next;
-
-	for ( p = vrf; vrf != NULL; vrf = next ) {
-		next = vrf->vrf_next;
-===
 	ValuesReturnFilter	*next;
 
 	for ( ; vrf != NULL; vrf = next ) {
 		next = vrf->vrf_next;
->>> 1.1.1.5
 
 		switch ( vrf->vrf_choice & SLAPD_FILTER_MASK ) {
 		case LDAP_FILTER_PRESENT:

CVS commit: src/external/bsd/openldap

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Thu Feb  9 01:53:51 UTC 2017

Modified Files:
src/external/bsd/openldap: openldap2netbsd
src/external/bsd/openldap/dist/build: mkversion
src/external/bsd/openldap/dist/clients/tools: common.c
src/external/bsd/openldap/dist/include: Makefile.in ldap_queue.h
portable.hin
src/external/bsd/openldap/dist/libraries/libldap: os-ip.c os-local.c
tls_o.c
src/external/bsd/openldap/dist/libraries/liblutil: detach.c md5.c
passwd.c
src/external/bsd/openldap/dist/libraries/librewrite: session.c
src/external/bsd/openldap/dist/servers/slapd: filter.c
src/external/bsd/openldap/dist/servers/slapd/overlays: deref.c
Removed Files:
src/external/bsd/openldap/dist/libraries/liblmdb: sample-bdb.c
sample-mdb.c

Log Message:
merge conflicts


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/openldap/openldap2netbsd
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/openldap/dist/build/mkversion
cvs rdiff -u -r1.5 -r1.6 \
src/external/bsd/openldap/dist/clients/tools/common.c
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/openldap/dist/include/Makefile.in \
src/external/bsd/openldap/dist/include/portable.hin
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/openldap/dist/include/ldap_queue.h
cvs rdiff -u -r1.6 -r1.7 \
src/external/bsd/openldap/dist/libraries/libldap/os-ip.c
cvs rdiff -u -r1.7 -r1.8 \
src/external/bsd/openldap/dist/libraries/libldap/os-local.c
cvs rdiff -u -r1.4 -r1.5 \
src/external/bsd/openldap/dist/libraries/libldap/tls_o.c
cvs rdiff -u -r1.1.1.1 -r0 \
src/external/bsd/openldap/dist/libraries/liblmdb/sample-bdb.c \
src/external/bsd/openldap/dist/libraries/liblmdb/sample-mdb.c
cvs rdiff -u -r1.3 -r1.4 \
src/external/bsd/openldap/dist/libraries/liblutil/detach.c \
src/external/bsd/openldap/dist/libraries/liblutil/md5.c
cvs rdiff -u -r1.4 -r1.5 \
src/external/bsd/openldap/dist/libraries/liblutil/passwd.c
cvs rdiff -u -r1.2 -r1.3 \
src/external/bsd/openldap/dist/libraries/librewrite/session.c
cvs rdiff -u -r1.2 -r1.3 \
src/external/bsd/openldap/dist/servers/slapd/filter.c
cvs rdiff -u -r1.2 -r1.3 \
src/external/bsd/openldap/dist/servers/slapd/overlays/deref.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/external/bsd/openldap

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Thu Feb  9 01:53:51 UTC 2017

Modified Files:
src/external/bsd/openldap: openldap2netbsd
src/external/bsd/openldap/dist/build: mkversion
src/external/bsd/openldap/dist/clients/tools: common.c
src/external/bsd/openldap/dist/include: Makefile.in ldap_queue.h
portable.hin
src/external/bsd/openldap/dist/libraries/libldap: os-ip.c os-local.c
tls_o.c
src/external/bsd/openldap/dist/libraries/liblutil: detach.c md5.c
passwd.c
src/external/bsd/openldap/dist/libraries/librewrite: session.c
src/external/bsd/openldap/dist/servers/slapd: filter.c
src/external/bsd/openldap/dist/servers/slapd/overlays: deref.c
Removed Files:
src/external/bsd/openldap/dist/libraries/liblmdb: sample-bdb.c
sample-mdb.c

Log Message:
merge conflicts


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/openldap/openldap2netbsd
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/openldap/dist/build/mkversion
cvs rdiff -u -r1.5 -r1.6 \
src/external/bsd/openldap/dist/clients/tools/common.c
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/openldap/dist/include/Makefile.in \
src/external/bsd/openldap/dist/include/portable.hin
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/openldap/dist/include/ldap_queue.h
cvs rdiff -u -r1.6 -r1.7 \
src/external/bsd/openldap/dist/libraries/libldap/os-ip.c
cvs rdiff -u -r1.7 -r1.8 \
src/external/bsd/openldap/dist/libraries/libldap/os-local.c
cvs rdiff -u -r1.4 -r1.5 \
src/external/bsd/openldap/dist/libraries/libldap/tls_o.c
cvs rdiff -u -r1.1.1.1 -r0 \
src/external/bsd/openldap/dist/libraries/liblmdb/sample-bdb.c \
src/external/bsd/openldap/dist/libraries/liblmdb/sample-mdb.c
cvs rdiff -u -r1.3 -r1.4 \
src/external/bsd/openldap/dist/libraries/liblutil/detach.c \
src/external/bsd/openldap/dist/libraries/liblutil/md5.c
cvs rdiff -u -r1.4 -r1.5 \
src/external/bsd/openldap/dist/libraries/liblutil/passwd.c
cvs rdiff -u -r1.2 -r1.3 \
src/external/bsd/openldap/dist/libraries/librewrite/session.c
cvs rdiff -u -r1.2 -r1.3 \
src/external/bsd/openldap/dist/servers/slapd/filter.c
cvs rdiff -u -r1.2 -r1.3 \
src/external/bsd/openldap/dist/servers/slapd/overlays/deref.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/openldap/openldap2netbsd
diff -u src/external/bsd/openldap/openldap2netbsd:1.2 src/external/bsd/openldap/openldap2netbsd:1.3
--- src/external/bsd/openldap/openldap2netbsd:1.2	Sat Oct  8 15:28:38 2011
+++ src/external/bsd/openldap/openldap2netbsd	Wed Feb  8 20:53:50 2017
@@ -1,6 +1,6 @@
 #! /bin/sh
 #
-#	$NetBSD: openldap2netbsd,v 1.2 2011/10/08 19:28:38 christos Exp $
+#	$NetBSD: openldap2netbsd,v 1.3 2017/02/09 01:53:50 christos Exp $
 #
 # Copyright (c) 1998, 1999, 2010 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -30,17 +30,27 @@
 # netbsd openldap source tree, under src/external/bsd/openldap/dist.
 #
 
-d=. #XXX
+if [ -z "$1" ] 
+then
+	echo "Usage: $0 " 1>&2
+	exit 1
+fi
+
+d="$1"
 
 ### Remove the $'s around RCS tags
-cleantags $d
+cleantags "$d"
 ### Add our NetBSD RCS Id
-find $d -name '*.[chly]' -print | while read c; do
-	sed 1q < $c | grep -q '\$NetBSD' || (
-echo "/*	\$NetBSD\$	*/" >/tmp/openldap3n$$
-echo "" >>/tmp/openldap3n$$
-cat $c  >> /tmp/openldap3n$$
-mv /tmp/openldap3n$$ $c && echo added NetBSD RCS tag to $c
+find "$d" -name '*.[chly]' -print | while read c; do
+	sed 1q < "$c" | grep -q '\$NetBSD' || (
+sed -i -e '1i \
+/*	$NetBSD: openldap2netbsd,v 1.3 2017/02/09 01:53:50 christos Exp $	*/\
+
+' -e '/#include "portable.h"/i \
+#include \
+__RCSID("$NetBSD: openldap2netbsd,v 1.3 2017/02/09 01:53:50 christos Exp $");\
+
+' "$c"
 	)
 done
 

Index: src/external/bsd/openldap/dist/build/mkversion
diff -u src/external/bsd/openldap/dist/build/mkversion:1.5 src/external/bsd/openldap/dist/build/mkversion:1.6
--- src/external/bsd/openldap/dist/build/mkversion:1.5	Wed May 28 06:12:43 2014
+++ src/external/bsd/openldap/dist/build/mkversion	Wed Feb  8 20:53:50 2017
@@ -3,7 +3,7 @@
 # $OpenLDAP$
 ## This work is part of OpenLDAP Software .
 ##
-## Copyright 1998-2014 The OpenLDAP Foundation.
+## Copyright 1998-2016 The OpenLDAP Foundation.
 ## All rights reserved.
 ##
 ## Redistribution and use in source and binary forms, with or without
@@ -54,7 +54,7 @@ APPLICATION=$1
 cat << __EOF__
 /* This work is part of OpenLDAP Software .
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
+ * Copyright 1998-2016 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -67,7 +67,7 @@ cat << __EOF__
  */
 
 static const char copyright[] =
-"Copyright 1998-2014 The OpenLDAP Foundation.  All rights reserved.\n"
+"Copyright 1998-2016 The 

CVS commit: src/external/bsd/openldap/include

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Thu Jan 12 23:03:49 UTC 2017

Modified Files:
src/external/bsd/openldap/include: portable.h

Log Message:
don't mess with snprintf!


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/openldap/include/portable.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/openldap/include/portable.h
diff -u src/external/bsd/openldap/include/portable.h:1.6 src/external/bsd/openldap/include/portable.h:1.7
--- src/external/bsd/openldap/include/portable.h:1.6	Wed May 28 07:09:18 2014
+++ src/external/bsd/openldap/include/portable.h	Thu Jan 12 18:03:49 2017
@@ -1116,7 +1116,7 @@
 /* #undef size_t */
 
 /* define to snprintf routine */
-#define snprintf _snprintf
+/* #undef _snprintf */
 
 /* Define like ber_socklen_t if  does not define. */
 /* #undef socklen_t */

CVS commit: src/external/bsd/openldap/include

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Thu Jan 12 23:03:49 UTC 2017

Modified Files:
src/external/bsd/openldap/include: portable.h

Log Message:
don't mess with snprintf!


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/openldap/include/portable.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/external/bsd/openldap/dist/clients/tools

[Joerg Sonnenberger]

Module Name:src
Committed By:   joerg
Date:   Wed Nov  2 13:15:54 UTC 2016

Modified Files:
src/external/bsd/openldap/dist/clients/tools: common.c

Log Message:
Logical negation binds stronger than bitwise and, which doesn't seem to
be intended here.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
src/external/bsd/openldap/dist/clients/tools/common.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/openldap/dist/clients/tools/common.c
diff -u src/external/bsd/openldap/dist/clients/tools/common.c:1.4 src/external/bsd/openldap/dist/clients/tools/common.c:1.5
--- src/external/bsd/openldap/dist/clients/tools/common.c:1.4	Wed May 28 10:12:43 2014
+++ src/external/bsd/openldap/dist/clients/tools/common.c	Wed Nov  2 13:15:53 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: common.c,v 1.4 2014/05/28 10:12:43 tron Exp $	*/
+/*	$NetBSD: common.c,v 1.5 2016/11/02 13:15:53 joerg Exp $	*/
 
 /* common.c - common routines for the ldap client tools */
 /* $OpenLDAP$ */
@@ -2330,7 +2330,7 @@ void tool_print_ctrls(
 		/* known controls */
 		for ( j = 0; tool_ctrl_response[j].oid != NULL; j++ ) {
 			if ( strcmp( tool_ctrl_response[j].oid, ctrls[i]->ldctl_oid ) == 0 ) {
-if ( !tool_ctrl_response[j].mask & tool_type ) {
+if ( !(tool_ctrl_response[j].mask & tool_type) ) {
 	/* this control should not appear
 	 * with this tool; warning? */
 }

CVS commit: src/external/bsd/openldap/dist/clients/tools

[Joerg Sonnenberger]

Module Name:src
Committed By:   joerg
Date:   Wed Nov  2 13:15:54 UTC 2016

Modified Files:
src/external/bsd/openldap/dist/clients/tools: common.c

Log Message:
Logical negation binds stronger than bitwise and, which doesn't seem to
be intended here.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
src/external/bsd/openldap/dist/clients/tools/common.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/external/bsd/openldap/dist/servers/slapd

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sat Feb  7 17:57:00 UTC 2015

Modified Files:
src/external/bsd/openldap/dist/servers/slapd: filter.c

Log Message:
Apply: http://www.openldap.org/devel/gitweb.cgi?p=openldap.git;a=commit;\
h=2f1a2dd329b91afe561cd06b872d09630d4edb6a

Certain search queries including the Matched Values control can trigger
a double free in slapd 2.4.40 when freeing operation controls. This is a
regression in 2.4.40, no earlier releases are affected. [CVE-1546]

XXX: Pullup-7


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.4 -r1.2 \
src/external/bsd/openldap/dist/servers/slapd/filter.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/openldap/dist/servers/slapd/filter.c
diff -u src/external/bsd/openldap/dist/servers/slapd/filter.c:1.1.1.4 src/external/bsd/openldap/dist/servers/slapd/filter.c:1.2
--- src/external/bsd/openldap/dist/servers/slapd/filter.c:1.1.1.4	Wed May 28 05:58:46 2014
+++ src/external/bsd/openldap/dist/servers/slapd/filter.c	Sat Feb  7 12:56:59 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: filter.c,v 1.1.1.4 2014/05/28 09:58:46 tron Exp $	*/
+/*	$NetBSD: filter.c,v 1.2 2015/02/07 17:56:59 christos Exp $	*/
 
 /* filter.c - routines for parsing and dealing with filters */
 /* $OpenLDAP$ */
@@ -1160,14 +1160,10 @@ get_vrFilter( Operation *op, BerElement 
 void
 vrFilter_free( Operation *op, ValuesReturnFilter *vrf )
 {
-	ValuesReturnFilter	*p, *next;
+	ValuesReturnFilter	*next;
 
-	if ( vrf == NULL ) {
-		return;
-	}
-
-	for ( p = vrf; p != NULL; p = next ) {
-		next = p-vrf_next;
+	for ( p = vrf; vrf != NULL; vrf = next ) {
+		next = vrf-vrf_next;
 
 		switch ( vrf-vrf_choice  SLAPD_FILTER_MASK ) {
 		case LDAP_FILTER_PRESENT:

CVS commit: src/external/bsd/openldap/dist/servers/slapd

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sat Feb  7 17:57:00 UTC 2015

Modified Files:
src/external/bsd/openldap/dist/servers/slapd: filter.c

Log Message:
Apply: http://www.openldap.org/devel/gitweb.cgi?p=openldap.git;a=commit;\
h=2f1a2dd329b91afe561cd06b872d09630d4edb6a

Certain search queries including the Matched Values control can trigger
a double free in slapd 2.4.40 when freeing operation controls. This is a
regression in 2.4.40, no earlier releases are affected. [CVE-1546]

XXX: Pullup-7


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.4 -r1.2 \
src/external/bsd/openldap/dist/servers/slapd/filter.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/external/bsd/openldap/dist/servers/slapd/overlays

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sat Feb  7 17:58:23 UTC 2015

Modified Files:
src/external/bsd/openldap/dist/servers/slapd/overlays: deref.c

Log Message:
Apply: http://www.openldap.org/devel/gitweb.cgi?p=openldap.git;a=commit;\
h=c32e74763f77675b9e144126e375977ed6dc562c
The deref overlay in slapd 2.4.13 through 2.4.40 dereferences a NULL
pointer when a search request includes the Deref control with an empty
list of attributes to return (missing input validation). [CVE-2015-1545]

XXX: Pullup-7


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.3 -r1.2 \
src/external/bsd/openldap/dist/servers/slapd/overlays/deref.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/openldap/dist/servers/slapd/overlays/deref.c
diff -u src/external/bsd/openldap/dist/servers/slapd/overlays/deref.c:1.1.1.3 src/external/bsd/openldap/dist/servers/slapd/overlays/deref.c:1.2
--- src/external/bsd/openldap/dist/servers/slapd/overlays/deref.c:1.1.1.3	Wed May 28 05:58:52 2014
+++ src/external/bsd/openldap/dist/servers/slapd/overlays/deref.c	Sat Feb  7 12:58:23 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: deref.c,v 1.1.1.3 2014/05/28 09:58:52 tron Exp $	*/
+/*	$NetBSD: deref.c,v 1.2 2015/02/07 17:58:23 christos Exp $	*/
 
 /* deref.c - dereference overlay */
 /* $OpenLDAP$ */
@@ -185,7 +185,8 @@ deref_parseCtrl (
 		ber_len_t cnt = sizeof(struct berval);
 		ber_len_t off = 0;
 
-		if ( ber_scanf( ber, {m{M}}, derefAttr, attributes, cnt, off ) == LBER_ERROR )
+		if ( ber_scanf( ber, {m{M}}, derefAttr, attributes, cnt, off ) == LBER_ERROR
+			|| !cnt )
 		{
 			rs-sr_text = Dereference control: derefSpec decoding error;
 			rs-sr_err = LDAP_PROTOCOL_ERROR;

CVS commit: src/external/bsd/openldap/dist

[Matthias Scheler]

Module Name:src
Committed By:   tron
Date:   Wed May 28 10:12:43 UTC 2014

Modified Files:
src/external/bsd/openldap/dist/build: mkversion
src/external/bsd/openldap/dist/clients/tools: common.c
src/external/bsd/openldap/dist/include: Makefile.in ldap_queue.h
portable.hin
src/external/bsd/openldap/dist/libraries/libldap: os-ip.c os-local.c
tls_o.c
src/external/bsd/openldap/dist/libraries/liblutil: detach.c md5.c
passwd.c
Removed Files:
src/external/bsd/openldap/dist/contrib/ldapc++: LICENSE
src/external/bsd/openldap/dist/contrib/slapd-modules/acl: README
src/external/bsd/openldap/dist/doc/guide: COPYRIGHT LICENSE
src/external/bsd/openldap/dist/libraries/libldap_r: thr_lwp.c
src/external/bsd/openldap/dist/libraries/liblutil: fetch.c ldif.c

Log Message:
Resolve conflicts from last import.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/openldap/dist/build/mkversion
cvs rdiff -u -r1.3 -r1.4 \
src/external/bsd/openldap/dist/clients/tools/common.c
cvs rdiff -u -r1.1.1.1 -r0 \
src/external/bsd/openldap/dist/contrib/ldapc++/LICENSE
cvs rdiff -u -r1.1.1.3 -r0 \
src/external/bsd/openldap/dist/contrib/slapd-modules/acl/README
cvs rdiff -u -r1.1.1.4 -r0 src/external/bsd/openldap/dist/doc/guide/COPYRIGHT
cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/openldap/dist/doc/guide/LICENSE
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/openldap/dist/include/Makefile.in \
src/external/bsd/openldap/dist/include/portable.hin
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/openldap/dist/include/ldap_queue.h
cvs rdiff -u -r1.5 -r1.6 \
src/external/bsd/openldap/dist/libraries/libldap/os-ip.c
cvs rdiff -u -r1.6 -r1.7 \
src/external/bsd/openldap/dist/libraries/libldap/os-local.c
cvs rdiff -u -r1.3 -r1.4 \
src/external/bsd/openldap/dist/libraries/libldap/tls_o.c
cvs rdiff -u -r1.1.1.3 -r0 \
src/external/bsd/openldap/dist/libraries/libldap_r/thr_lwp.c
cvs rdiff -u -r1.2 -r1.3 \
src/external/bsd/openldap/dist/libraries/liblutil/detach.c \
src/external/bsd/openldap/dist/libraries/liblutil/md5.c
cvs rdiff -u -r1.1.1.3 -r0 \
src/external/bsd/openldap/dist/libraries/liblutil/fetch.c \
src/external/bsd/openldap/dist/libraries/liblutil/ldif.c
cvs rdiff -u -r1.3 -r1.4 \
src/external/bsd/openldap/dist/libraries/liblutil/passwd.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/openldap/dist/build/mkversion
diff -u src/external/bsd/openldap/dist/build/mkversion:1.4 src/external/bsd/openldap/dist/build/mkversion:1.5
--- src/external/bsd/openldap/dist/build/mkversion:1.4	Sun Dec 12 15:46:27 2010
+++ src/external/bsd/openldap/dist/build/mkversion	Wed May 28 10:12:43 2014
@@ -1,9 +1,9 @@
 #! /bin/sh
 # Create a version.c file
-# OpenLDAP: pkg/ldap/build/mkversion,v 1.14.2.5 2010/04/13 20:22:21 kurt Exp
+# $OpenLDAP$
 ## This work is part of OpenLDAP Software http://www.openldap.org/.
 ##
-## Copyright 1998-2010 The OpenLDAP Foundation.
+## Copyright 1998-2014 The OpenLDAP Foundation.
 ## All rights reserved.
 ##
 ## Redistribution and use in source and binary forms, with or without
@@ -54,7 +54,7 @@ APPLICATION=$1
 cat  __EOF__
 /* This work is part of OpenLDAP Software http://www.openldap.org/.
  *
- * Copyright 1998-2010 The OpenLDAP Foundation.
+ * Copyright 1998-2014 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -67,7 +67,7 @@ cat  __EOF__
  */
 
 static const char copyright[] =
-Copyright 1998-2010 The OpenLDAP Foundation.  All rights reserved.\n
+Copyright 1998-2014 The OpenLDAP Foundation.  All rights reserved.\n
 COPYING RESTRICTIONS APPLY\n;
 
 $static $const char $SYMBOL[] =

Index: src/external/bsd/openldap/dist/clients/tools/common.c
diff -u src/external/bsd/openldap/dist/clients/tools/common.c:1.3 src/external/bsd/openldap/dist/clients/tools/common.c:1.4
--- src/external/bsd/openldap/dist/clients/tools/common.c:1.3	Sun Dec 12 15:46:28 2010
+++ src/external/bsd/openldap/dist/clients/tools/common.c	Wed May 28 10:12:43 2014
@@ -1,10 +1,10 @@
-/*	$NetBSD: common.c,v 1.3 2010/12/12 15:46:28 adam Exp $	*/
+/*	$NetBSD: common.c,v 1.4 2014/05/28 10:12:43 tron Exp $	*/
 
 /* common.c - common routines for the ldap client tools */
-/* OpenLDAP: pkg/ldap/clients/tools/common.c,v 1.78.2.31 2010/04/15 22:16:49 quanah Exp */
+/* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software http://www.openldap.org/.
  *
- * Copyright 1998-2010 The OpenLDAP Foundation.
+ * Copyright 1998-2014 The OpenLDAP Foundation.
  * Portions Copyright 2003 Kurt D. Zeilenga.
  * Portions Copyright 2003 IBM Corporation.
  * All rights reserved.
@@ -68,6 +68,7 @@ int		nocanon = 0;
 int		referrals = 0;
 int		verbose = 0;
 int		ldif = 0;
+ber_len_t	ldif_wrap = LDIF_LINE_WIDTH;
 char		*prog = 

CVS commit: src/external/bsd/openldap/dist/libraries/librewrite

[Matthias Scheler]

Module Name:src
Committed By:   tron
Date:   Wed May 28 10:14:13 UTC 2014

Modified Files:
src/external/bsd/openldap/dist/libraries/librewrite: session.c

Log Message:
Apply patch to fix CVE-2013-4449. This shouldn't be necessary as we don't
build the server or its plug-ins. But it is better to be safe in case
this changes.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.4 -r1.2 \
src/external/bsd/openldap/dist/libraries/librewrite/session.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/openldap/dist/libraries/librewrite/session.c
diff -u src/external/bsd/openldap/dist/libraries/librewrite/session.c:1.1.1.4 src/external/bsd/openldap/dist/libraries/librewrite/session.c:1.2
--- src/external/bsd/openldap/dist/libraries/librewrite/session.c:1.1.1.4	Wed May 28 09:58:45 2014
+++ src/external/bsd/openldap/dist/libraries/librewrite/session.c	Wed May 28 10:14:13 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: session.c,v 1.1.1.4 2014/05/28 09:58:45 tron Exp $	*/
+/*	$NetBSD: session.c,v 1.2 2014/05/28 10:14:13 tron Exp $	*/
 
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software http://www.openldap.org/.
@@ -163,6 +163,7 @@ rewrite_session_find(
 #ifdef USE_REWRITE_LDAP_PVT_THREADS
 	if ( session ) {
 		ldap_pvt_thread_mutex_lock( session-ls_mutex );
+		session-ls_count++;
 	}
 	ldap_pvt_thread_rdwr_runlock( info-li_cookies_mutex );
 #endif /* USE_REWRITE_LDAP_PVT_THREADS */
@@ -180,6 +181,7 @@ rewrite_session_return(
 )
 {
 	assert( session != NULL );
+	session-ls_count--;
 	ldap_pvt_thread_mutex_unlock( session-ls_mutex );
 }
 

CVS commit: src/external/bsd/openldap

[Matthias Scheler]

Module Name:src
Committed By:   tron
Date:   Wed May 28 11:32:20 UTC 2014

Modified Files:
src/external/bsd/openldap: openldap.mk
src/external/bsd/openldap/bin: Makefile.inc
src/external/bsd/openldap/lib/liblber: shlib_version
src/external/bsd/openldap/lib/libldap: Makefile Makefile.libldap
shlib_version
src/external/bsd/openldap/lib/libldap_r: Makefile shlib_version
src/external/bsd/openldap/lib/liblutil: Makefile

Log Message:
Update for building OpenLDAP 2.4.39.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/openldap/openldap.mk
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/openldap/bin/Makefile.inc
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/openldap/lib/liblber/shlib_version
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/openldap/lib/libldap/Makefile
cvs rdiff -u -r1.6 -r1.7 \
src/external/bsd/openldap/lib/libldap/Makefile.libldap
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/openldap/lib/libldap/shlib_version
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/openldap/lib/libldap_r/Makefile
cvs rdiff -u -r1.5 -r1.6 \
src/external/bsd/openldap/lib/libldap_r/shlib_version
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/openldap/lib/liblutil/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/openldap/openldap.mk
diff -u src/external/bsd/openldap/openldap.mk:1.5 src/external/bsd/openldap/openldap.mk:1.6
--- src/external/bsd/openldap/openldap.mk:1.5	Sun Dec 12 16:10:42 2010
+++ src/external/bsd/openldap/openldap.mk	Wed May 28 11:32:19 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: openldap.mk,v 1.5 2010/12/12 16:10:42 adam Exp $
+#	$NetBSD: openldap.mk,v 1.6 2014/05/28 11:32:19 tron Exp $
 
 .include bsd.own.mk
 
@@ -16,7 +16,7 @@ LDAP_RUNDIR=	/var/openldap
 CPPFLAGS+=	-I${LDAP_SRCDIR}/include
 CPPFLAGS+=	-I${LDAP_DISTDIR}/include
 
-.for _LIB in lutil		# XXX lber ldap ldap_r lunicode rewrite
+.for _LIB in lutil ldap		# XXX lber ldap_r lunicode rewrite
 .if !defined(LDAPOBJDIR.${_LIB})
 LDAPOBJDIR.${_LIB}!=	cd ${LDAP_SRCDIR}/lib/lib${_LIB}  ${PRINTOBJDIR}
 .MAKEOVERRIDES+=	LDAPOBJDIR.${_LIB}

Index: src/external/bsd/openldap/bin/Makefile.inc
diff -u src/external/bsd/openldap/bin/Makefile.inc:1.4 src/external/bsd/openldap/bin/Makefile.inc:1.5
--- src/external/bsd/openldap/bin/Makefile.inc:1.4	Wed Sep 11 23:04:10 2013
+++ src/external/bsd/openldap/bin/Makefile.inc	Wed May 28 11:32:19 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.inc,v 1.4 2013/09/11 23:04:10 joerg Exp $
+#	$NetBSD: Makefile.inc,v 1.5 2014/05/28 11:32:19 tron Exp $
 
 .include ../openldap.mk
 
@@ -24,7 +24,7 @@ version.c: ../openldap.mk
 LDADD+=	-L${LDAPOBJDIR.lutil} -llutil
 DPADD+=	${LDAPLIB.lutil}
 
-LDADD+= -lldap
+LDADD+= -L${LDAPOBJDIR.ldap} -lldap
 DPADD+= ${LIBLDAP}
 LDADD+=	-llber
 DPADD+=	${LIBLBER}

Index: src/external/bsd/openldap/lib/liblber/shlib_version
diff -u src/external/bsd/openldap/lib/liblber/shlib_version:1.4 src/external/bsd/openldap/lib/liblber/shlib_version:1.5
--- src/external/bsd/openldap/lib/liblber/shlib_version:1.4	Sun Dec 12 16:19:54 2010
+++ src/external/bsd/openldap/lib/liblber/shlib_version	Wed May 28 11:32:19 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: shlib_version,v 1.4 2010/12/12 16:19:54 adam Exp $
+#	$NetBSD: shlib_version,v 1.5 2014/05/28 11:32:19 tron Exp $
 #
 major=3
-minor=2
+minor=3

Index: src/external/bsd/openldap/lib/libldap/Makefile
diff -u src/external/bsd/openldap/lib/libldap/Makefile:1.3 src/external/bsd/openldap/lib/libldap/Makefile:1.4
--- src/external/bsd/openldap/lib/libldap/Makefile:1.3	Thu May 26 12:56:26 2011
+++ src/external/bsd/openldap/lib/libldap/Makefile	Wed May 28 11:32:19 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.3 2011/05/26 12:56:26 joerg Exp $
+#	$NetBSD: Makefile,v 1.4 2014/05/28 11:32:19 tron Exp $
 
 USE_FORT?=	yes
 
@@ -11,7 +11,7 @@ LIB=		ldap
 .PATH:		${LDAP_SRCDIR}/man
 
 MAN=		ldap.3 ldap_abandon.3 ldap_add.3 ldap_bind.3 ldap_compare.3 \
-		ldap_delete.3 ldap_error.3 ldap_first_attribute.3 \
+		ldap_delete.3 ldap_dup.3 ldap_error.3 ldap_first_attribute.3 \
 		ldap_first_entry.3 ldap_first_message.3 \
 		ldap_first_reference.3 ldap_get_dn.3 ldap_get_values.3 \
 		ldap_modify.3 ldap_modrdn.3 ldap_open.3 \

Index: src/external/bsd/openldap/lib/libldap/Makefile.libldap
diff -u src/external/bsd/openldap/lib/libldap/Makefile.libldap:1.6 src/external/bsd/openldap/lib/libldap/Makefile.libldap:1.7
--- src/external/bsd/openldap/lib/libldap/Makefile.libldap:1.6	Mon Mar  8 05:18:17 2010
+++ src/external/bsd/openldap/lib/libldap/Makefile.libldap	Wed May 28 11:32:19 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.libldap,v 1.6 2010/03/08 05:18:17 lukem Exp $
+#	$NetBSD: Makefile.libldap,v 1.7 2014/05/28 11:32:19 tron Exp $
 
 .include ../../openldap.mk
 
@@ -15,7 +15,7 @@ SRCS+=		bind.c open.c result.c error.c c
 		init.c options.c print.c string.c util-int.c schema.c \
 		charray.c os-local.c dnssrv.c utf-8.c 

CVS commit: src/external/bsd/openldap/dist

[Matthias Scheler]

Module Name:src
Committed By:   tron
Date:   Wed May 28 10:12:43 UTC 2014

Modified Files:
src/external/bsd/openldap/dist/build: mkversion
src/external/bsd/openldap/dist/clients/tools: common.c
src/external/bsd/openldap/dist/include: Makefile.in ldap_queue.h
portable.hin
src/external/bsd/openldap/dist/libraries/libldap: os-ip.c os-local.c
tls_o.c
src/external/bsd/openldap/dist/libraries/liblutil: detach.c md5.c
passwd.c
Removed Files:
src/external/bsd/openldap/dist/contrib/ldapc++: LICENSE
src/external/bsd/openldap/dist/contrib/slapd-modules/acl: README
src/external/bsd/openldap/dist/doc/guide: COPYRIGHT LICENSE
src/external/bsd/openldap/dist/libraries/libldap_r: thr_lwp.c
src/external/bsd/openldap/dist/libraries/liblutil: fetch.c ldif.c

Log Message:
Resolve conflicts from last import.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/openldap/dist/build/mkversion
cvs rdiff -u -r1.3 -r1.4 \
src/external/bsd/openldap/dist/clients/tools/common.c
cvs rdiff -u -r1.1.1.1 -r0 \
src/external/bsd/openldap/dist/contrib/ldapc++/LICENSE
cvs rdiff -u -r1.1.1.3 -r0 \
src/external/bsd/openldap/dist/contrib/slapd-modules/acl/README
cvs rdiff -u -r1.1.1.4 -r0 src/external/bsd/openldap/dist/doc/guide/COPYRIGHT
cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/openldap/dist/doc/guide/LICENSE
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/openldap/dist/include/Makefile.in \
src/external/bsd/openldap/dist/include/portable.hin
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/openldap/dist/include/ldap_queue.h
cvs rdiff -u -r1.5 -r1.6 \
src/external/bsd/openldap/dist/libraries/libldap/os-ip.c
cvs rdiff -u -r1.6 -r1.7 \
src/external/bsd/openldap/dist/libraries/libldap/os-local.c
cvs rdiff -u -r1.3 -r1.4 \
src/external/bsd/openldap/dist/libraries/libldap/tls_o.c
cvs rdiff -u -r1.1.1.3 -r0 \
src/external/bsd/openldap/dist/libraries/libldap_r/thr_lwp.c
cvs rdiff -u -r1.2 -r1.3 \
src/external/bsd/openldap/dist/libraries/liblutil/detach.c \
src/external/bsd/openldap/dist/libraries/liblutil/md5.c
cvs rdiff -u -r1.1.1.3 -r0 \
src/external/bsd/openldap/dist/libraries/liblutil/fetch.c \
src/external/bsd/openldap/dist/libraries/liblutil/ldif.c
cvs rdiff -u -r1.3 -r1.4 \
src/external/bsd/openldap/dist/libraries/liblutil/passwd.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/external/bsd/openldap/dist/libraries/librewrite

[Matthias Scheler]

Module Name:src
Committed By:   tron
Date:   Wed May 28 10:14:13 UTC 2014

Modified Files:
src/external/bsd/openldap/dist/libraries/librewrite: session.c

Log Message:
Apply patch to fix CVE-2013-4449. This shouldn't be necessary as we don't
build the server or its plug-ins. But it is better to be safe in case
this changes.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.4 -r1.2 \
src/external/bsd/openldap/dist/libraries/librewrite/session.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/external/bsd/openldap

[Matthias Scheler]

Module Name:src
Committed By:   tron
Date:   Wed May 28 11:32:20 UTC 2014

Modified Files:
src/external/bsd/openldap: openldap.mk
src/external/bsd/openldap/bin: Makefile.inc
src/external/bsd/openldap/lib/liblber: shlib_version
src/external/bsd/openldap/lib/libldap: Makefile Makefile.libldap
shlib_version
src/external/bsd/openldap/lib/libldap_r: Makefile shlib_version
src/external/bsd/openldap/lib/liblutil: Makefile

Log Message:
Update for building OpenLDAP 2.4.39.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/openldap/openldap.mk
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/openldap/bin/Makefile.inc
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/openldap/lib/liblber/shlib_version
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/openldap/lib/libldap/Makefile
cvs rdiff -u -r1.6 -r1.7 \
src/external/bsd/openldap/lib/libldap/Makefile.libldap
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/openldap/lib/libldap/shlib_version
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/openldap/lib/libldap_r/Makefile
cvs rdiff -u -r1.5 -r1.6 \
src/external/bsd/openldap/lib/libldap_r/shlib_version
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/openldap/lib/liblutil/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/external/bsd/openldap/dist/include

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Tue Nov 26 01:31:43 UTC 2013

Modified Files:
src/external/bsd/openldap/dist/include: ldap_queue.h

Log Message:
Kill CIRCLEQ, nothing uses it and it will not work with gcc-4.8, so avoid
future accidents.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.3 -r1.2 \
src/external/bsd/openldap/dist/include/ldap_queue.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/openldap/dist/include/ldap_queue.h
diff -u src/external/bsd/openldap/dist/include/ldap_queue.h:1.1.1.3 src/external/bsd/openldap/dist/include/ldap_queue.h:1.2
--- src/external/bsd/openldap/dist/include/ldap_queue.h:1.1.1.3	Sun Dec 12 10:21:24 2010
+++ src/external/bsd/openldap/dist/include/ldap_queue.h	Mon Nov 25 20:31:43 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: ldap_queue.h,v 1.1.1.3 2010/12/12 15:21:24 adam Exp $	*/
+/*	$NetBSD: ldap_queue.h,v 1.2 2013/11/26 01:31:43 christos Exp $	*/
 
 /* ldap_queue.h -- queue macros */
 /* OpenLDAP: pkg/ldap/include/ldap_queue.h,v 1.13.2.5 2010/04/13 20:22:48 kurt Exp */
@@ -109,24 +109,24 @@
  * For details on the use of these macros, see the queue(3) manual page.
  * All macros are prefixed with LDAP_.
  *
- *			SLIST_	LIST_	STAILQ_	TAILQ_	CIRCLEQ_
- * _HEAD		+	+	+	+	+
- * _ENTRY		+	+	+	+	+
- * _INIT		+	+	+	+	+
- * _ENTRY_INIT		+	+	+	+	+
- * _EMPTY		+	+	+	+	+
- * _FIRST		+	+	+	+	+
- * _NEXT		+	+	+	+	+
- * _PREV		-	-	-	+	+
- * _LAST		-	-	+	+	+
- * _FOREACH		+	+	+	+	+
- * _FOREACH_REVERSE	-	-	-	+	+
- * _INSERT_HEAD		+	+	+	+	+
- * _INSERT_BEFORE	-	+	-	+	+
- * _INSERT_AFTER	+	+	+	+	+
- * _INSERT_TAIL		-	-	+	+	+
- * _REMOVE_HEAD		+	-	+	-	-
- * _REMOVE		+	+	+	+	+
+ *			SLIST_	LIST_	STAILQ_	TAILQ_
+ * _HEAD		+	+	+	+
+ * _ENTRY		+	+	+	+
+ * _INIT		+	+	+	+
+ * _ENTRY_INIT		+	+	+	+
+ * _EMPTY		+	+	+	+
+ * _FIRST		+	+	+	+
+ * _NEXT		+	+	+	+
+ * _PREV		-	-	-	+
+ * _LAST		-	-	+	+
+ * _FOREACH		+	+	+	+
+ * _FOREACH_REVERSE	-	-	-	+
+ * _INSERT_HEAD		+	+	+	+
+ * _INSERT_BEFORE	-	+	-	+
+ * _INSERT_AFTER	+	+	+	+
+ * _INSERT_TAIL		-	-	+	+
+ * _REMOVE_HEAD		+	-	+	-
+ * _REMOVE		+	+	+	+
  *
  */
 
@@ -460,105 +460,4 @@ struct {\
 	*(elm)-field.tqe_prev = (elm)-field.tqe_next;			\
 } while (0)
 
-/*
- * Circular queue definitions.
- */
-#define LDAP_CIRCLEQ_HEAD(name, type)	\
-struct name {\
-	struct type *cqh_first;		/* first element */		\
-	struct type *cqh_last;		/* last element */		\
-}
-
-#define LDAP_CIRCLEQ_ENTRY(type)	\
-struct {\
-	struct type *cqe_next;		/* next element */		\
-	struct type *cqe_prev;		/* previous element */		\
-}
-
-/*
- * Circular queue functions.
- */
-#define LDAP_CIRCLEQ_EMPTY(head) ((head)-cqh_first == (void *)(head))
-
-#define LDAP_CIRCLEQ_FIRST(head) ((head)-cqh_first)
-
-#define LDAP_CIRCLEQ_FOREACH(var, head, field)\
-	for((var) = (head)-cqh_first;	\
-	(var) != (void *)(head);	\
-	(var) = (var)-field.cqe_next)
-
-#define LDAP_CIRCLEQ_FOREACH_REVERSE(var, head, field)			\
-	for((var) = (head)-cqh_last;	\
-	(var) != (void *)(head);	\
-	(var) = (var)-field.cqe_prev)
-
-#define	LDAP_CIRCLEQ_INIT(head) do {	\
-	(head)-cqh_first = (void *)(head);\
-	(head)-cqh_last = (void *)(head);\
-} while (0)
-
-#define LDAP_CIRCLEQ_ENTRY_INIT(var, field) do {			\
-	(var)-field.cqe_next = NULL;	\
-	(var)-field.cqe_prev = NULL;	\
-} while (0)
-
-#define LDAP_CIRCLEQ_INSERT_AFTER(head, listelm, elm, field) do {	\
-	(elm)-field.cqe_next = (listelm)-field.cqe_next;		\
-	(elm)-field.cqe_prev = (listelm);\
-	if ((listelm)-field.cqe_next == (void *)(head))		\
-		(head)-cqh_last = (elm);\
-	else\
-		(listelm)-field.cqe_next-field.cqe_prev = (elm);	\
-	(listelm)-field.cqe_next = (elm);\
-} while (0)
-
-#define LDAP_CIRCLEQ_INSERT_BEFORE(head, listelm, elm, field) do {	\
-	(elm)-field.cqe_next = (listelm);\
-	(elm)-field.cqe_prev = (listelm)-field.cqe_prev;		\
-	if ((listelm)-field.cqe_prev == (void *)(head))		\
-		(head)-cqh_first = (elm);\
-	else\
-		(listelm)-field.cqe_prev-field.cqe_next = (elm);	\
-	(listelm)-field.cqe_prev = (elm);\
-} while (0)
-
-#define LDAP_CIRCLEQ_INSERT_HEAD(head, elm, field) do {			\
-	(elm)-field.cqe_next = (head)-cqh_first;			\
-	(elm)-field.cqe_prev = (void *)(head);\
-	if ((head)-cqh_last == (void *)(head))\
-		(head)-cqh_last = (elm);\
-	else\
-		(head)-cqh_first-field.cqe_prev = (elm);		\
-	(head)-cqh_first = (elm);	\
-} while (0)
-
-#define LDAP_CIRCLEQ_INSERT_TAIL(head, elm, field) do {			\
-	(elm)-field.cqe_next = (void *)(head);\
-	(elm)-field.cqe_prev = (head)-cqh_last;			\
-	if ((head)-cqh_first == (void *)(head))			\
-		(head)-cqh_first = (elm);\
-	else\
-		(head)-cqh_last-field.cqe_next = (elm);		\
-	(head)-cqh_last = (elm);	\
-} while (0)
-
-#define LDAP_CIRCLEQ_LAST(head) ((head)-cqh_last)
-
-#define LDAP_CIRCLEQ_NEXT(elm,field) 

CVS commit: src/external/bsd/openldap/dist/include

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Tue Nov 26 01:31:43 UTC 2013

Modified Files:
src/external/bsd/openldap/dist/include: ldap_queue.h

Log Message:
Kill CIRCLEQ, nothing uses it and it will not work with gcc-4.8, so avoid
future accidents.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.3 -r1.2 \
src/external/bsd/openldap/dist/include/ldap_queue.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/external/bsd/openldap/dist/libraries/liblutil

[Joerg Sonnenberger]

Module Name:src
Committed By:   joerg
Date:   Fri Jul  1 02:01:21 UTC 2011

Modified Files:
src/external/bsd/openldap/dist/libraries/liblutil: md5.c

Log Message:
Fix memset usage.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.3 -r1.2 \
src/external/bsd/openldap/dist/libraries/liblutil/md5.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/openldap/dist/libraries/liblutil/md5.c
diff -u src/external/bsd/openldap/dist/libraries/liblutil/md5.c:1.1.1.3 src/external/bsd/openldap/dist/libraries/liblutil/md5.c:1.2
--- src/external/bsd/openldap/dist/libraries/liblutil/md5.c:1.1.1.3	Sun Dec 12 15:22:09 2010
+++ src/external/bsd/openldap/dist/libraries/liblutil/md5.c	Fri Jul  1 02:01:21 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: md5.c,v 1.1.1.3 2010/12/12 15:22:09 adam Exp $	*/
+/*	$NetBSD: md5.c,v 1.2 2011/07/01 02:01:21 joerg Exp $	*/
 
 /* md5.c -- MD5 message-digest algorithm */
 /* OpenLDAP: pkg/ldap/libraries/liblutil/md5.c,v 1.19.2.5 2010/04/13 20:23:06 kurt Exp */
@@ -187,7 +187,7 @@
 	putu32(ctx-buf[1], digest + 4);
 	putu32(ctx-buf[2], digest + 8);
 	putu32(ctx-buf[3], digest + 12);
-	memset(ctx, '\0', sizeof(ctx));	/* In case it's sensitive */
+	memset(ctx, '\0', sizeof(*ctx));	/* In case it's sensitive */
 }
 
 #ifndef ASM_MD5

CVS commit: src/external/bsd/openldap/dist/libraries/liblutil

[Joerg Sonnenberger]

Module Name:src
Committed By:   joerg
Date:   Fri Jul  1 02:01:21 UTC 2011

Modified Files:
src/external/bsd/openldap/dist/libraries/liblutil: md5.c

Log Message:
Fix memset usage.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.3 -r1.2 \
src/external/bsd/openldap/dist/libraries/liblutil/md5.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/external/bsd/openldap/dist/libraries/libldap

[Joerg Sonnenberger]

Module Name:src
Committed By:   joerg
Date:   Tue May 24 16:03:15 UTC 2011

Modified Files:
src/external/bsd/openldap/dist/libraries/libldap: os-ip.c os-local.c

Log Message:
Fix formatting of time_t


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
src/external/bsd/openldap/dist/libraries/libldap/os-ip.c
cvs rdiff -u -r1.5 -r1.6 \
src/external/bsd/openldap/dist/libraries/libldap/os-local.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/openldap/dist/libraries/libldap/os-ip.c
diff -u src/external/bsd/openldap/dist/libraries/libldap/os-ip.c:1.4 src/external/bsd/openldap/dist/libraries/libldap/os-ip.c:1.5
--- src/external/bsd/openldap/dist/libraries/libldap/os-ip.c:1.4	Sun Dec 12 15:46:33 2010
+++ src/external/bsd/openldap/dist/libraries/libldap/os-ip.c	Tue May 24 16:03:15 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: os-ip.c,v 1.4 2010/12/12 15:46:33 adam Exp $	*/
+/*	$NetBSD: os-ip.c,v 1.5 2011/05/24 16:03:15 joerg Exp $	*/
 
 /* os-ip.c -- platform-specific TCP  UDP related code */
 /* OpenLDAP: pkg/ldap/libraries/libldap/os-ip.c,v 1.118.2.20 2010/04/13 20:22:58 kurt Exp */
@@ -283,8 +283,8 @@
 	int		rc;
 		
 
-	osip_debug(ld, ldap_int_poll: fd: %d tm: %ld\n,
-		s, tvp ? tvp-tv_sec : -1L, 0);
+	osip_debug(ld, ldap_int_poll: fd: %d tm: %jd\n,
+		s, tvp ? (intmax_t)tvp-tv_sec : -1, 0);
 
 #ifdef HAVE_POLL
 	{
@@ -432,8 +432,8 @@
 		opt_tv = tv;
 	}
 
-	osip_debug(ld, ldap_pvt_connect: fd: %d tm: %ld async: %d\n,
-			s, opt_tv ? tv.tv_sec : -1L, async);
+	osip_debug(ld, ldap_pvt_connect: fd: %d tm: %jd async: %d\n,
+			s, opt_tv ? (intmax_t)tv.tv_sec : -1, async);
 
 	if ( opt_tv  ldap_pvt_ndelay_on(ld, s) == -1 )
 		return ( -1 );

Index: src/external/bsd/openldap/dist/libraries/libldap/os-local.c
diff -u src/external/bsd/openldap/dist/libraries/libldap/os-local.c:1.5 src/external/bsd/openldap/dist/libraries/libldap/os-local.c:1.6
--- src/external/bsd/openldap/dist/libraries/libldap/os-local.c:1.5	Sun Dec 12 15:46:33 2010
+++ src/external/bsd/openldap/dist/libraries/libldap/os-local.c	Tue May 24 16:03:15 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: os-local.c,v 1.5 2010/12/12 15:46:33 adam Exp $	*/
+/*	$NetBSD: os-local.c,v 1.6 2011/05/24 16:03:15 joerg Exp $	*/
 
 /* os-local.c -- platform-specific domain socket code */
 /* OpenLDAP: pkg/ldap/libraries/libldap/os-local.c,v 1.44.2.10 2010/04/13 20:22:59 kurt Exp */
@@ -178,8 +178,8 @@
 		opt_tv = tv;
 	}
 
-	oslocal_debug(ld, ldap_connect_timeout: fd: %d tm: %ld async: %d\n,
-		s, opt_tv ? tv.tv_sec : -1L, async);
+	oslocal_debug(ld, ldap_connect_timeout: fd: %d tm: %jd async: %d\n,
+		s, opt_tv ? (intmax_t)tv.tv_sec : -1, async);
 
 	if ( ldap_pvt_ndelay_on(ld, s) == -1 ) return -1;
 

Re: CVS commit: src/external/bsd/openldap/dist

[Bernd Ernesti]

On Sun, Dec 12, 2010 at 03:25:26PM +, Adam Ciarcinski wrote:
 Module Name:  src
 Committed By: adam
 Date: Sun Dec 12 15:25:26 UTC 2010
 
 Update of /cvsroot/src/external/bsd/openldap/dist
 In directory ivanova.netbsd.org:/tmp/cvs-serv1493
 
 Log Message:
 Imported openldap-2.4.23
 
 Status:
 
 Vendor Tag:   OPENLDAP
 Release Tags: OPENLDAP_2_4_23
   
 U src/external/bsd/openldap/dist/aclocal.m4
[..]

Please include a changelog in your commit message even if it is a small
one when you import an updated version.

Bernd

CVS commit: src/external/bsd/openldap/dist

[Adam Ciarcinski]

Module Name:src
Committed By:   adam
Date:   Sun Dec 12 15:46:33 UTC 2010

Modified Files:
src/external/bsd/openldap/dist/build: mkversion
src/external/bsd/openldap/dist/clients/tools: common.c
src/external/bsd/openldap/dist/include: Makefile.in portable.hin
src/external/bsd/openldap/dist/libraries/libldap: os-ip.c os-local.c
tls_o.c
src/external/bsd/openldap/dist/libraries/liblutil: passwd.c
Removed Files:
src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd:
AUTHORS COPYING ChangeLog HACKING INSTALL Makefile.am Makefile.in
NEWS README TODO aclocal.m4 compile config.guess config.h.in
config.sub configure configure.ac depcomp install-sh missing
mkinstalldirs nslcd-common.h nslcd.h nss-ldapd.conf

src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/common:
Makefile.am Makefile.in dict.c dict.h set.c set.h tio.c tio.h

src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/compat:
Makefile.am Makefile.in attrs.h daemon.c daemon.h ether.c ether.h
getopt_long.c getopt_long.h getpeercred.c getpeercred.h pagectrl.c
pagectrl.h
src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/m4:
acx_pthread.m4

src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/man:
Makefile.am Makefile.in nslcd.8 nslcd.8.xml nss-ldapd.conf.5
nss-ldapd.conf.5.xml

src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/nslcd:
Makefile.am Makefile.in alias.c attmap.c attmap.h cfg.c cfg.h
common.c common.h ether.c group.c host.c log.c log.h myldap.c
myldap.h netgroup.c network.c nslcd.c passwd.c protocol.c rpc.c
service.c shadow.c

src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/nss:
Makefile.am Makefile.in aliases.c common.c common.h ethers.c
exports.linux group.c hosts.c netgroup.c networks.c pam.c passwd.c
protocols.c prototypes.h rpc.c services.c shadow.c

src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/tests:
Makefile.am Makefile.in nss-ldapd-test.conf test_aliases.c
test_cfg.c test_dict.c test_ethers.c test_group.c test_hosts.c
test_myldap.c test_myldap.sh test_netgroup.c test_networks.c
test_nslcd_group.c test_nsscmds.sh test_passwd.c test_protocols.c
test_rpc.c test_services.c test_set.c test_shadow.c test_tio.c
usernames.txt
src/external/bsd/openldap/dist/doc/drafts:
draft-zeilenga-ldap-txn-xx.txt
src/external/bsd/openldap/dist/libraries/liblutil: csn.c
src/external/bsd/openldap/dist/tests/scripts: acfilter.sh

Log Message:
Merge 2.4.23


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/openldap/dist/build/mkversion
cvs rdiff -u -r1.2 -r1.3 \
src/external/bsd/openldap/dist/clients/tools/common.c
cvs rdiff -u -r1.1.1.1 -r0 \

src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/AUTHORS \

src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/COPYING \

src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/ChangeLog \

src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/HACKING \

src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/INSTALL \

src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/Makefile.am
 \

src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/Makefile.in
 \
src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/NEWS \
src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/README 
\
src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/TODO \

src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/aclocal.m4 
\

src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/compile \

src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/config.guess
 \

src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/config.h.in
 \

src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/config.sub 
\

src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/configure \

src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/configure.ac
 \

src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/depcomp \

src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/install-sh 
\

src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/missing \

src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/mkinstalldirs
 \

CVS commit: src/external/bsd/openldap/dist/include

[Adam Ciarcinski]

Module Name:src
Committed By:   adam
Date:   Sun Dec 12 16:10:19 UTC 2010

Modified Files:
src/external/bsd/openldap/dist/include: portable.hin

Log Message:
Use conditional WORDS_BIGENDIAN


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/openldap/dist/include/portable.hin

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/openldap/dist/include/portable.hin
diff -u src/external/bsd/openldap/dist/include/portable.hin:1.3 src/external/bsd/openldap/dist/include/portable.hin:1.4
--- src/external/bsd/openldap/dist/include/portable.hin:1.3	Sun Dec 12 15:46:32 2010
+++ src/external/bsd/openldap/dist/include/portable.hin	Sun Dec 12 16:10:18 2010
@@ -1077,7 +1077,9 @@
 
 /* Define to 1 if your processor stores words with the most significant byte
first (like Motorola and SPARC, unlike Intel and VAX). */
-#undef WORDS_BIGENDIAN
+#if defined __BIG_ENDIAN__
+#  define WORDS_BIGENDIAN 1
+#endif
 
 /* Define to the type of arg 3 for `accept'. */
 #undef ber_socklen_t

CVS commit: src/external/bsd/openldap/lib

[Adam Ciarcinski]

Module Name:src
Committed By:   adam
Date:   Sun Dec 12 16:19:55 UTC 2010

Modified Files:
src/external/bsd/openldap/lib/liblber: shlib_version
src/external/bsd/openldap/lib/libldap: shlib_version
src/external/bsd/openldap/lib/libldap_r: shlib_version

Log Message:
bump minor version for 2.4.23


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/openldap/lib/liblber/shlib_version
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/openldap/lib/libldap/shlib_version
cvs rdiff -u -r1.4 -r1.5 \
src/external/bsd/openldap/lib/libldap_r/shlib_version

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/openldap/lib/liblber/shlib_version
diff -u src/external/bsd/openldap/lib/liblber/shlib_version:1.3 src/external/bsd/openldap/lib/liblber/shlib_version:1.4
--- src/external/bsd/openldap/lib/liblber/shlib_version:1.3	Mon Mar  8 05:45:24 2010
+++ src/external/bsd/openldap/lib/liblber/shlib_version	Sun Dec 12 16:19:54 2010
@@ -1,4 +1,4 @@
-#	$NetBSD: shlib_version,v 1.3 2010/03/08 05:45:24 lukem Exp $
+#	$NetBSD: shlib_version,v 1.4 2010/12/12 16:19:54 adam Exp $
 #
 major=3
-minor=1
+minor=2

Index: src/external/bsd/openldap/lib/libldap/shlib_version
diff -u src/external/bsd/openldap/lib/libldap/shlib_version:1.4 src/external/bsd/openldap/lib/libldap/shlib_version:1.5
--- src/external/bsd/openldap/lib/libldap/shlib_version:1.4	Mon Mar  8 05:45:24 2010
+++ src/external/bsd/openldap/lib/libldap/shlib_version	Sun Dec 12 16:19:55 2010
@@ -1,4 +1,4 @@
-#	$NetBSD: shlib_version,v 1.4 2010/03/08 05:45:24 lukem Exp $
+#	$NetBSD: shlib_version,v 1.5 2010/12/12 16:19:55 adam Exp $
 #
 major=4
-minor=1
+minor=2

Index: src/external/bsd/openldap/lib/libldap_r/shlib_version
diff -u src/external/bsd/openldap/lib/libldap_r/shlib_version:1.4 src/external/bsd/openldap/lib/libldap_r/shlib_version:1.5
--- src/external/bsd/openldap/lib/libldap_r/shlib_version:1.4	Mon Mar  8 05:45:24 2010
+++ src/external/bsd/openldap/lib/libldap_r/shlib_version	Sun Dec 12 16:19:55 2010
@@ -1,4 +1,4 @@
-#	$NetBSD: shlib_version,v 1.4 2010/03/08 05:45:24 lukem Exp $
+#	$NetBSD: shlib_version,v 1.5 2010/12/12 16:19:55 adam Exp $
 #
 major=4
-minor=1
+minor=2

CVS commit: src/external/bsd/openldap/man

[Joerg Sonnenberger]

Module Name:src
Committed By:   joerg
Date:   Sun Dec 12 18:40:02 UTC 2010

Modified Files:
src/external/bsd/openldap/man: ldap.conf.5

Log Message:
Reply 1.15, lost in the last update.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/openldap/man/ldap.conf.5

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/openldap/man/ldap.conf.5
diff -u src/external/bsd/openldap/man/ldap.conf.5:1.6 src/external/bsd/openldap/man/ldap.conf.5:1.7
--- src/external/bsd/openldap/man/ldap.conf.5:1.6	Sun Dec 12 16:10:43 2010
+++ src/external/bsd/openldap/man/ldap.conf.5	Sun Dec 12 18:40:01 2010
@@ -159,7 +159,6 @@
 of the search.
 .RE
 .TP
-.TP
 .B HOST name[:port] ...
 Specifies the name(s) of an LDAP server(s) to which the
 .I LDAP 

CVS commit: src/external/bsd/openldap/man

[Joerg Sonnenberger]

Module Name:src
Committed By:   joerg
Date:   Sun Dec 12 20:19:41 UTC 2010

Modified Files:
src/external/bsd/openldap/man: ldapurl.1

Log Message:
Kill double .TP


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/openldap/man/ldapurl.1

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/openldap/man/ldapurl.1
diff -u src/external/bsd/openldap/man/ldapurl.1:1.3 src/external/bsd/openldap/man/ldapurl.1:1.4
--- src/external/bsd/openldap/man/ldapurl.1:1.3	Sun Dec 12 16:10:43 2010
+++ src/external/bsd/openldap/man/ldapurl.1	Sun Dec 12 20:19:41 2010
@@ -52,7 +52,6 @@
 .BR \-s .
 .SH OPTIONS
 .TP
-.TP
 .BI \-a \ attrs
 Set a comma-separated list of attribute selectors.
 .TP

CVS commit: src/external/bsd/openldap/dist

[Adam Ciarcinski]

Module Name:src
Committed By:   adam
Date:   Sun Dec 12 15:46:33 UTC 2010

Modified Files:
src/external/bsd/openldap/dist/build: mkversion
src/external/bsd/openldap/dist/clients/tools: common.c
src/external/bsd/openldap/dist/include: Makefile.in portable.hin
src/external/bsd/openldap/dist/libraries/libldap: os-ip.c os-local.c
tls_o.c
src/external/bsd/openldap/dist/libraries/liblutil: passwd.c
Removed Files:
src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd:
AUTHORS COPYING ChangeLog HACKING INSTALL Makefile.am Makefile.in
NEWS README TODO aclocal.m4 compile config.guess config.h.in
config.sub configure configure.ac depcomp install-sh missing
mkinstalldirs nslcd-common.h nslcd.h nss-ldapd.conf

src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/common:
Makefile.am Makefile.in dict.c dict.h set.c set.h tio.c tio.h

src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/compat:
Makefile.am Makefile.in attrs.h daemon.c daemon.h ether.c ether.h
getopt_long.c getopt_long.h getpeercred.c getpeercred.h pagectrl.c
pagectrl.h
src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/m4:
acx_pthread.m4

src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/man:
Makefile.am Makefile.in nslcd.8 nslcd.8.xml nss-ldapd.conf.5
nss-ldapd.conf.5.xml

src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/nslcd:
Makefile.am Makefile.in alias.c attmap.c attmap.h cfg.c cfg.h
common.c common.h ether.c group.c host.c log.c log.h myldap.c
myldap.h netgroup.c network.c nslcd.c passwd.c protocol.c rpc.c
service.c shadow.c

src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/nss:
Makefile.am Makefile.in aliases.c common.c common.h ethers.c
exports.linux group.c hosts.c netgroup.c networks.c pam.c passwd.c
protocols.c prototypes.h rpc.c services.c shadow.c

src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/tests:
Makefile.am Makefile.in nss-ldapd-test.conf test_aliases.c
test_cfg.c test_dict.c test_ethers.c test_group.c test_hosts.c
test_myldap.c test_myldap.sh test_netgroup.c test_networks.c
test_nslcd_group.c test_nsscmds.sh test_passwd.c test_protocols.c
test_rpc.c test_services.c test_set.c test_shadow.c test_tio.c
usernames.txt
src/external/bsd/openldap/dist/doc/drafts:
draft-zeilenga-ldap-txn-xx.txt
src/external/bsd/openldap/dist/libraries/liblutil: csn.c
src/external/bsd/openldap/dist/tests/scripts: acfilter.sh

Log Message:
Merge 2.4.23


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/openldap/dist/build/mkversion
cvs rdiff -u -r1.2 -r1.3 \
src/external/bsd/openldap/dist/clients/tools/common.c
cvs rdiff -u -r1.1.1.1 -r0 \

src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/AUTHORS \

src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/COPYING \

src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/ChangeLog \

src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/HACKING \

src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/INSTALL \

src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/Makefile.am
 \

src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/Makefile.in
 \
src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/NEWS \
src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/README 
\
src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/TODO \

src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/aclocal.m4 
\

src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/compile \

src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/config.guess
 \

src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/config.h.in
 \

src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/config.sub 
\

src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/configure \

src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/configure.ac
 \

src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/depcomp \

src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/install-sh 
\

src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/missing \

src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/mkinstalldirs
 \

CVS commit: src/external/bsd/openldap/dist/include

[Adam Ciarcinski]

Module Name:src
Committed By:   adam
Date:   Sun Dec 12 16:10:19 UTC 2010

Modified Files:
src/external/bsd/openldap/dist/include: portable.hin

Log Message:
Use conditional WORDS_BIGENDIAN


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/openldap/dist/include/portable.hin

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/external/bsd/openldap

[Adam Ciarcinski]

Module Name:src
Committed By:   adam
Date:   Sun Dec 12 16:10:44 UTC 2010

Modified Files:
src/external/bsd/openldap: openldap.mk
src/external/bsd/openldap/include: lber_types.h ldap_config.h
ldap_features.h portable.h
src/external/bsd/openldap/lib/liblutil: Makefile
src/external/bsd/openldap/man: lber-decode.3 lber-encode.3
lber-memory.3 lber-sockbuf.3 lber-types.3 ldap.3 ldap.conf.5
ldap_abandon.3 ldap_add.3 ldap_bind.3 ldap_compare.3
ldap_controls.3 ldap_delete.3 ldap_error.3
ldap_extended_operation.3 ldap_first_attribute.3 ldap_first_entry.3
ldap_first_message.3 ldap_first_reference.3 ldap_get_dn.3
ldap_get_option.3 ldap_get_values.3 ldap_memory.3 ldap_modify.3
ldap_modrdn.3 ldap_open.3 ldap_parse_reference.3
ldap_parse_result.3 ldap_parse_sort_control.3
ldap_parse_vlv_control.3 ldap_rename.3 ldap_result.3 ldap_schema.3
ldap_search.3 ldap_sort.3 ldap_sync.3 ldap_tls.3 ldap_url.3
ldapcompare.1 ldapdelete.1 ldapmodify.1 ldapmodrdn.1 ldappasswd.1
ldapsearch.1 ldapurl.1 ldapwhoami.1 ldif.5 slapacl.8 slapadd.8
slapauth.8 slapcat.8 slapd-bdb.5 slapd-config.5 slapd-dnssrv.5
slapd-ldap.5 slapd-ldbm.5 slapd-ldif.5 slapd-meta.5 slapd-monitor.5
slapd-ndb.5 slapd-null.5 slapd-passwd.5 slapd-perl.5 slapd-relay.5
slapd-shell.5 slapd-sock.5 slapd-sql.5 slapd.8 slapd.access.5
slapd.backends.5 slapd.conf.5 slapd.overlays.5 slapd.plugin.5
slapdn.8 slapindex.8 slapo-accesslog.5 slapo-auditlog.5
slapo-chain.5 slapo-collect.5 slapo-constraint.5 slapo-dds.5
slapo-dyngroup.5 slapo-dynlist.5 slapo-memberof.5 slapo-pcache.5
slapo-ppolicy.5 slapo-refint.5 slapo-retcode.5 slapo-rwm.5
slapo-sssvlv.5 slapo-syncprov.5 slapo-translucent.5 slapo-unique.5
slapo-valsort.5 slappasswd.8 slapschema.8 slaptest.8
Added Files:
src/external/bsd/openldap/man: slapo-pbind.5

Log Message:
Update to OpenLDAP 2.4.23


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/openldap/openldap.mk
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/openldap/include/lber_types.h \
src/external/bsd/openldap/include/ldap_config.h
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/openldap/include/ldap_features.h
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/openldap/include/portable.h
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/openldap/lib/liblutil/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/openldap/man/lber-decode.3 \
src/external/bsd/openldap/man/lber-encode.3 \
src/external/bsd/openldap/man/lber-memory.3 \
src/external/bsd/openldap/man/lber-sockbuf.3 \
src/external/bsd/openldap/man/lber-types.3 \
src/external/bsd/openldap/man/ldap.3 \
src/external/bsd/openldap/man/ldap_abandon.3 \
src/external/bsd/openldap/man/ldap_add.3 \
src/external/bsd/openldap/man/ldap_bind.3 \
src/external/bsd/openldap/man/ldap_compare.3 \
src/external/bsd/openldap/man/ldap_controls.3 \
src/external/bsd/openldap/man/ldap_delete.3 \
src/external/bsd/openldap/man/ldap_error.3 \
src/external/bsd/openldap/man/ldap_extended_operation.3 \
src/external/bsd/openldap/man/ldap_first_attribute.3 \
src/external/bsd/openldap/man/ldap_first_entry.3 \
src/external/bsd/openldap/man/ldap_first_message.3 \
src/external/bsd/openldap/man/ldap_first_reference.3 \
src/external/bsd/openldap/man/ldap_get_dn.3 \
src/external/bsd/openldap/man/ldap_get_option.3 \
src/external/bsd/openldap/man/ldap_get_values.3 \
src/external/bsd/openldap/man/ldap_memory.3 \
src/external/bsd/openldap/man/ldap_modify.3 \
src/external/bsd/openldap/man/ldap_modrdn.3 \
src/external/bsd/openldap/man/ldap_open.3 \
src/external/bsd/openldap/man/ldap_parse_reference.3 \
src/external/bsd/openldap/man/ldap_parse_result.3 \
src/external/bsd/openldap/man/ldap_parse_sort_control.3 \
src/external/bsd/openldap/man/ldap_parse_vlv_control.3 \
src/external/bsd/openldap/man/ldap_rename.3 \
src/external/bsd/openldap/man/ldap_result.3 \
src/external/bsd/openldap/man/ldap_schema.3 \
src/external/bsd/openldap/man/ldap_search.3 \
src/external/bsd/openldap/man/ldap_sort.3 \
src/external/bsd/openldap/man/ldap_sync.3 \
src/external/bsd/openldap/man/ldap_tls.3 \
src/external/bsd/openldap/man/ldap_url.3 \
src/external/bsd/openldap/man/ldapcompare.1 \
src/external/bsd/openldap/man/ldapdelete.1 \
src/external/bsd/openldap/man/ldapmodify.1 \
src/external/bsd/openldap/man/ldapmodrdn.1 \
src/external/bsd/openldap/man/ldappasswd.1 \
src/external/bsd/openldap/man/ldapsearch.1 \
src/external/bsd/openldap/man/ldapwhoami.1 \
src/external/bsd/openldap/man/ldif.5 \
src/external/bsd/openldap/man/slapacl.8 \

CVS commit: src/external/bsd/openldap/lib

[Adam Ciarcinski]

Module Name:src
Committed By:   adam
Date:   Sun Dec 12 16:19:55 UTC 2010

Modified Files:
src/external/bsd/openldap/lib/liblber: shlib_version
src/external/bsd/openldap/lib/libldap: shlib_version
src/external/bsd/openldap/lib/libldap_r: shlib_version

Log Message:
bump minor version for 2.4.23


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/openldap/lib/liblber/shlib_version
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/openldap/lib/libldap/shlib_version
cvs rdiff -u -r1.4 -r1.5 \
src/external/bsd/openldap/lib/libldap_r/shlib_version

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/external/bsd/openldap/man

[Joerg Sonnenberger]

Module Name:src
Committed By:   joerg
Date:   Sun Dec 12 18:40:02 UTC 2010

Modified Files:
src/external/bsd/openldap/man: ldap.conf.5

Log Message:
Reply 1.15, lost in the last update.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/openldap/man/ldap.conf.5

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/external/bsd/openldap/man

[Joerg Sonnenberger]

Module Name:src
Committed By:   joerg
Date:   Sun Dec 12 20:19:41 UTC 2010

Modified Files:
src/external/bsd/openldap/man: ldapurl.1

Log Message:
Kill double .TP


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/openldap/man/ldapurl.1

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/external/bsd/openldap/man

[Joerg Sonnenberger]

Module Name:src
Committed By:   joerg
Date:   Sun Dec 12 20:20:43 UTC 2010

Modified Files:
src/external/bsd/openldap/man: ldapurl.1

Log Message:
Kill double .TP


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/openldap/man/ldapurl.1

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/external/bsd/openldap/dist/clients/tools

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Sun Jul 11 00:47:36 UTC 2010

Modified Files:
src/external/bsd/openldap/dist/clients/tools: common.c

Log Message:
add a miss #ifdef HAVE_TLS, that fixes MKCRYPTO=no build in here.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.3 -r1.2 \
src/external/bsd/openldap/dist/clients/tools/common.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/openldap/dist/clients/tools/common.c
diff -u src/external/bsd/openldap/dist/clients/tools/common.c:1.1.1.3 src/external/bsd/openldap/dist/clients/tools/common.c:1.2
--- src/external/bsd/openldap/dist/clients/tools/common.c:1.1.1.3	Mon Mar  8 02:14:14 2010
+++ src/external/bsd/openldap/dist/clients/tools/common.c	Sun Jul 11 00:47:36 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: common.c,v 1.1.1.3 2010/03/08 02:14:14 lukem Exp $	*/
+/*	$NetBSD: common.c,v 1.2 2010/07/11 00:47:36 mrg Exp $	*/
 
 /* common.c - common routines for the ldap client tools */
 /* OpenLDAP: pkg/ldap/clients/tools/common.c,v 1.78.2.29 2009/09/29 21:47:37 quanah Exp */
@@ -1286,6 +1286,7 @@
 			exit( EXIT_FAILURE );
 		}
 
+#ifdef HAVE_TLS
 		if ( use_tls ) {
 			rc = ldap_start_tls_s( ld, NULL, NULL );
 			if ( rc != LDAP_SUCCESS ) {
@@ -1298,6 +1299,7 @@
 }
 			}
 		}
+#endif
 
 		if ( nettimeout.tv_sec  0 ) {
 	 		if ( ldap_set_option( ld, LDAP_OPT_NETWORK_TIMEOUT, (void *) nettimeout )

CVS commit: src/external/bsd/openldap/dist/clients/tools

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Sun Jul 11 00:47:36 UTC 2010

Modified Files:
src/external/bsd/openldap/dist/clients/tools: common.c

Log Message:
add a miss #ifdef HAVE_TLS, that fixes MKCRYPTO=no build in here.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.3 -r1.2 \
src/external/bsd/openldap/dist/clients/tools/common.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/external/bsd/openldap/man

[Joerg Sonnenberger]

Module Name:src
Committed By:   joerg
Date:   Sat Mar 20 20:27:57 UTC 2010

Modified Files:
src/external/bsd/openldap/man: ldapurl.1

Log Message:
Drop redundant TPs


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/openldap/man/ldapurl.1

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/openldap/man/ldapurl.1
diff -u src/external/bsd/openldap/man/ldapurl.1:1.1 src/external/bsd/openldap/man/ldapurl.1:1.2
--- src/external/bsd/openldap/man/ldapurl.1:1.1	Mon Mar  8 05:11:20 2010
+++ src/external/bsd/openldap/man/ldapurl.1	Sat Mar 20 20:27:57 2010
@@ -51,8 +51,6 @@
 and
 .BR \-s .
 .SH OPTIONS
-.TP
-.TP
 .BI \-a \ attrs
 Set a comma-separated list of attribute selectors.
 .TP
@@ -89,7 +87,6 @@
   rp[/cookie][/slimit] (LDAP Sync refreshAndPersist)
 .fi
 .TP
-.TP
 .BI \-f \ filter
 Set the URL filter.  No particular check on conformity with RFC 4515
 LDAP filters is performed, but the value is hex-escaped as required.

CVS commit: src/external/bsd/openldap/man

[Joerg Sonnenberger]

Module Name:src
Committed By:   joerg
Date:   Sat Mar 20 20:58:07 UTC 2010

Modified Files:
src/external/bsd/openldap/man: ldap.conf.5

Log Message:
Drop redundant .TP


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/openldap/man/ldap.conf.5

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/openldap/man/ldap.conf.5
diff -u src/external/bsd/openldap/man/ldap.conf.5:1.4 src/external/bsd/openldap/man/ldap.conf.5:1.5
--- src/external/bsd/openldap/man/ldap.conf.5:1.4	Mon Mar  8 05:08:40 2010
+++ src/external/bsd/openldap/man/ldap.conf.5	Sat Mar 20 20:58:06 2010
@@ -159,7 +159,6 @@
 of the search.
 .RE
 .TP
-.TP
 .B HOST name[:port] ...
 Specifies the name(s) of an LDAP server(s) to which the
 .I LDAP 

CVS commit: src/external/bsd/openldap/man

[Joerg Sonnenberger]

Module Name:src
Committed By:   joerg
Date:   Sat Mar 20 20:27:57 UTC 2010

Modified Files:
src/external/bsd/openldap/man: ldapurl.1

Log Message:
Drop redundant TPs


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/openldap/man/ldapurl.1

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/external/bsd/openldap/man

[Joerg Sonnenberger]

Module Name:src
Committed By:   joerg
Date:   Sat Mar 20 20:58:07 UTC 2010

Modified Files:
src/external/bsd/openldap/man: ldap.conf.5

Log Message:
Drop redundant .TP


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/openldap/man/ldap.conf.5

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Re: CVS commit: src/external/bsd/openldap/dist/include

[Joerg Sonnenberger]

On Mon, Mar 08, 2010 at 05:07:16AM +, Luke Mewburn wrote:
 Module Name:  src
 Committed By: lukem
 Date: Mon Mar  8 05:07:16 UTC 2010
 
 Modified Files:
   src/external/bsd/openldap/dist/include: portable.hin
 
 Log Message:
 Disable HAVE_TLS here; we'll conditionally enable it in the Makefiles.
 Disable HAVE_FETCH; API appears to be incompatible

Yes, the portable version has a different interface than the FreeBSD
version as the FreeBSD code depends on funopen(3). It is easy to provide
fallback code if anyone is interested.

Joerg

CVS commit: src/external/bsd/openldap/dist

[Luke Mewburn]

Module Name:src
Committed By:   lukem
Date:   Mon Mar  8 03:47:40 UTC 2010

Modified Files:
src/external/bsd/openldap/dist/build: mkversion
src/external/bsd/openldap/dist/include: Makefile.in
src/external/bsd/openldap/dist/libraries/libldap: os-ip.c os-local.c
Removed Files:
src/external/bsd/openldap/dist/build: crupdate db.4.2.52.patch
src/external/bsd/openldap/dist/contrib/slapd-modules/addpartial:
COPYRIGHT LICENSE
src/external/bsd/openldap/dist/contrib/slapd-modules/autogroup:
COPYRIGHT
src/external/bsd/openldap/dist/libraries/libldap: tls.c
src/external/bsd/openldap/dist/servers/slapd/schema: nadf.schema

Log Message:
Merge 2.4.21


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/openldap/dist/build/crupdate \
src/external/bsd/openldap/dist/build/db.4.2.52.patch
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/openldap/dist/build/mkversion
cvs rdiff -u -r1.1.1.1 -r0 \
src/external/bsd/openldap/dist/contrib/slapd-modules/addpartial/COPYRIGHT \
src/external/bsd/openldap/dist/contrib/slapd-modules/addpartial/LICENSE
cvs rdiff -u -r1.1.1.1 -r0 \
src/external/bsd/openldap/dist/contrib/slapd-modules/autogroup/COPYRIGHT
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/openldap/dist/include/Makefile.in
cvs rdiff -u -r1.2 -r1.3 \
src/external/bsd/openldap/dist/libraries/libldap/os-ip.c
cvs rdiff -u -r1.3 -r1.4 \
src/external/bsd/openldap/dist/libraries/libldap/os-local.c
cvs rdiff -u -r1.2 -r0 src/external/bsd/openldap/dist/libraries/libldap/tls.c
cvs rdiff -u -r1.1.1.1 -r0 \
src/external/bsd/openldap/dist/servers/slapd/schema/nadf.schema

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/openldap/dist/build/mkversion
diff -u src/external/bsd/openldap/dist/build/mkversion:1.2 src/external/bsd/openldap/dist/build/mkversion:1.3
--- src/external/bsd/openldap/dist/build/mkversion:1.2	Tue Jul 15 18:38:38 2008
+++ src/external/bsd/openldap/dist/build/mkversion	Mon Mar  8 03:47:40 2010
@@ -1,9 +1,9 @@
 #! /bin/sh
 # Create a version.c file
-# $OpenLDAP: pkg/ldap/build/mkversion,v 1.14.2.3 2008/02/11 23:26:37 kurt Exp $
+# OpenLDAP: pkg/ldap/build/mkversion,v 1.14.2.4 2009/01/22 00:00:41 kurt Exp
 ## This work is part of OpenLDAP Software http://www.openldap.org/.
 ##
-## Copyright 1998-2008 The OpenLDAP Foundation.
+## Copyright 1998-2009 The OpenLDAP Foundation.
 ## All rights reserved.
 ##
 ## Redistribution and use in source and binary forms, with or without
@@ -54,7 +54,7 @@
 cat  __EOF__
 /* This work is part of OpenLDAP Software http://www.openldap.org/.
  *
- * Copyright 1998-2008 The OpenLDAP Foundation.
+ * Copyright 1998-2009 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -67,7 +67,7 @@
  */
 
 static const char copyright[] =
-Copyright 1998-2008 The OpenLDAP Foundation.  All rights reserved.\n
+Copyright 1998-2009 The OpenLDAP Foundation.  All rights reserved.\n
 COPYING RESTRICTIONS APPLY\n;
 
 $static $const char $SYMBOL[] =

Index: src/external/bsd/openldap/dist/include/Makefile.in
diff -u src/external/bsd/openldap/dist/include/Makefile.in:1.2 src/external/bsd/openldap/dist/include/Makefile.in:1.3
--- src/external/bsd/openldap/dist/include/Makefile.in:1.2	Thu May 22 13:21:32 2008
+++ src/external/bsd/openldap/dist/include/Makefile.in	Mon Mar  8 03:47:40 2010
@@ -1,8 +1,8 @@
 # include Makefile.in for OpenLDAP
-# $OpenLDAP: pkg/ldap/include/Makefile.in,v 1.33.2.3 2008/02/11 23:26:40 kurt Exp $
+# OpenLDAP: pkg/ldap/include/Makefile.in,v 1.33.2.4 2009/01/22 00:00:51 kurt Exp
 ## This work is part of OpenLDAP Software http://www.openldap.org/.
 ##
-## Copyright 1998-2008 The OpenLDAP Foundation.
+## Copyright 1998-2009 The OpenLDAP Foundation.
 ## All rights reserved.
 ##
 ## Redistribution and use in source and binary forms, with or without

Index: src/external/bsd/openldap/dist/libraries/libldap/os-ip.c
diff -u src/external/bsd/openldap/dist/libraries/libldap/os-ip.c:1.2 src/external/bsd/openldap/dist/libraries/libldap/os-ip.c:1.3
--- src/external/bsd/openldap/dist/libraries/libldap/os-ip.c:1.2	Tue Feb 23 16:35:06 2010
+++ src/external/bsd/openldap/dist/libraries/libldap/os-ip.c	Mon Mar  8 03:47:40 2010
@@ -1,8 +1,10 @@
+/*	$NetBSD: os-ip.c,v 1.3 2010/03/08 03:47:40 lukem Exp $	*/
+
 /* os-ip.c -- platform-specific TCP  UDP related code */
-/* $OpenLDAP: pkg/ldap/libraries/libldap/os-ip.c,v 1.118.2.8 2008/05/20 00:05:30 quanah Exp $ */
+/* OpenLDAP: pkg/ldap/libraries/libldap/os-ip.c,v 1.118.2.19 2009/08/14 20:31:32 quanah Exp */
 /* This work is part of OpenLDAP Software http://www.openldap.org/.
  *
- * Copyright 1998-2008 The OpenLDAP Foundation.
+ * Copyright 1998-2009 The OpenLDAP Foundation.
  * Portions Copyright 1999 Lars Uffmann.
  * All rights reserved.
  *
@@ -142,6 

CVS commit: src/external/bsd/openldap/dist/libraries/liblutil

[Luke Mewburn]

Module Name:src
Committed By:   lukem
Date:   Mon Mar  8 04:58:18 UTC 2010

Modified Files:
src/external/bsd/openldap/dist/libraries/liblutil: passwd.c

Log Message:
include ac/time.h for timeval.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r1.2 \
src/external/bsd/openldap/dist/libraries/liblutil/passwd.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/external/bsd/openldap/dist/libraries/liblutil

[Luke Mewburn]

Module Name:src
Committed By:   lukem
Date:   Mon Mar  8 04:58:18 UTC 2010

Modified Files:
src/external/bsd/openldap/dist/libraries/liblutil: passwd.c

Log Message:
include ac/time.h for timeval.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r1.2 \
src/external/bsd/openldap/dist/libraries/liblutil/passwd.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/openldap/dist/libraries/liblutil/passwd.c
diff -u src/external/bsd/openldap/dist/libraries/liblutil/passwd.c:1.1.1.2 src/external/bsd/openldap/dist/libraries/liblutil/passwd.c:1.2
--- src/external/bsd/openldap/dist/libraries/liblutil/passwd.c:1.1.1.2	Mon Mar  8 02:14:17 2010
+++ src/external/bsd/openldap/dist/libraries/liblutil/passwd.c	Mon Mar  8 04:58:18 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: passwd.c,v 1.1.1.2 2010/03/08 02:14:17 lukem Exp $	*/
+/*	$NetBSD: passwd.c,v 1.2 2010/03/08 04:58:18 lukem Exp $	*/
 
 /* OpenLDAP: pkg/ldap/libraries/liblutil/passwd.c,v 1.104.2.9 2009/08/30 22:55:47 quanah Exp */
 /* This work is part of OpenLDAP Software http://www.openldap.org/.
@@ -33,6 +33,7 @@
 #include stdio.h
 #include ac/stdlib.h
 #include ac/string.h
+#include ac/time.h
 #include ac/unistd.h
 
 #if defined(SLAPD_LMHASH)

CVS commit: src/external/bsd/openldap/dist/libraries/libldap

[Luke Mewburn]

Module Name:src
Committed By:   lukem
Date:   Mon Mar  8 05:00:51 UTC 2010

Modified Files:
src/external/bsd/openldap/dist/libraries/libldap: tls_o.c

Log Message:
fix const warning


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/external/bsd/openldap/dist/libraries/libldap/tls_o.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/openldap/dist/libraries/libldap/tls_o.c
diff -u src/external/bsd/openldap/dist/libraries/libldap/tls_o.c:1.1.1.1 src/external/bsd/openldap/dist/libraries/libldap/tls_o.c:1.2
--- src/external/bsd/openldap/dist/libraries/libldap/tls_o.c:1.1.1.1	Mon Mar  8 02:14:16 2010
+++ src/external/bsd/openldap/dist/libraries/libldap/tls_o.c	Mon Mar  8 05:00:51 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: tls_o.c,v 1.1.1.1 2010/03/08 02:14:16 lukem Exp $	*/
+/*	$NetBSD: tls_o.c,v 1.2 2010/03/08 05:00:51 lukem Exp $	*/
 
 /* tls_o.c - Handle tls/ssl using OpenSSL */
 /* OpenLDAP: pkg/ldap/libraries/libldap/tls_o.c,v 1.5.2.10 2009/10/30 17:55:19 quanah Exp */
@@ -663,7 +663,7 @@
 tlso_session_strength( tls_session *sess )
 {
 	tlso_session *s = (tlso_session *)sess;
-	SSL_CIPHER *c;
+	const SSL_CIPHER *c;
 
 	c = SSL_get_current_cipher(s);
 	return SSL_CIPHER_get_bits(c, NULL);

CVS commit: src/external/bsd/openldap/dist/libraries/libldap

[Luke Mewburn]

Module Name:src
Committed By:   lukem
Date:   Mon Mar  8 05:00:51 UTC 2010

Modified Files:
src/external/bsd/openldap/dist/libraries/libldap: tls_o.c

Log Message:
fix const warning


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/external/bsd/openldap/dist/libraries/libldap/tls_o.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/external/bsd/openldap/dist/include

[Luke Mewburn]

Module Name:src
Committed By:   lukem
Date:   Mon Mar  8 05:07:16 UTC 2010

Modified Files:
src/external/bsd/openldap/dist/include: portable.hin

Log Message:
Disable HAVE_TLS here; we'll conditionally enable it in the Makefiles.
Disable HAVE_FETCH; API appears to be incompatible


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r1.2 \
src/external/bsd/openldap/dist/include/portable.hin

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/external/bsd/openldap/include

[Luke Mewburn]

Module Name:src
Committed By:   lukem
Date:   Mon Mar  8 05:07:40 UTC 2010

Modified Files:
src/external/bsd/openldap/include: lber_types.h ldap_config.h
ldap_features.h portable.h

Log Message:
Regenerate for openldap 2.4.21


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/openldap/include/lber_types.h \
src/external/bsd/openldap/include/ldap_config.h
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/openldap/include/ldap_features.h
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/openldap/include/portable.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/openldap/include/lber_types.h
diff -u src/external/bsd/openldap/include/lber_types.h:1.1 src/external/bsd/openldap/include/lber_types.h:1.2
--- src/external/bsd/openldap/include/lber_types.h:1.1	Thu May 22 13:57:47 2008
+++ src/external/bsd/openldap/include/lber_types.h	Mon Mar  8 05:07:40 2010
@@ -1,8 +1,8 @@
-/* include/lber_types.h.  Generated by configure.  */
-/* $OpenLDAP: pkg/ldap/include/lber_types.hin,v 1.3.2.3 2008/02/11 23:26:40 kurt Exp $ */
+/* include/lber_types.h.  Generated from lber_types.hin by configure.  */
+/* OpenLDAP: pkg/ldap/include/lber_types.hin,v 1.3.2.4 2009/01/22 00:00:51 kurt Exp */
 /* This work is part of OpenLDAP Software http://www.openldap.org/.
  *
- * Copyright 1998-2008 The OpenLDAP Foundation.
+ * Copyright 1998-2009 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
Index: src/external/bsd/openldap/include/ldap_config.h
diff -u src/external/bsd/openldap/include/ldap_config.h:1.1 src/external/bsd/openldap/include/ldap_config.h:1.2
--- src/external/bsd/openldap/include/ldap_config.h:1.1	Thu May 22 13:57:47 2008
+++ src/external/bsd/openldap/include/ldap_config.h	Mon Mar  8 05:07:40 2010
@@ -1,8 +1,8 @@
 /* Generated from /usr/src/external/bsd/openldap/dist/include/ldap_config.hin */
-/* $OpenLDAP: pkg/ldap/include/ldap_config.hin,v 1.3.2.3 2008/02/11 23:26:40 kurt Exp $ */
+/* OpenLDAP: pkg/ldap/include/ldap_config.hin,v 1.3.2.4 2009/01/22 00:00:52 kurt Exp */
 /* This work is part of OpenLDAP Software http://www.openldap.org/.
  *
- * Copyright 1998-2008 The OpenLDAP Foundation.
+ * Copyright 1998-2009 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

Index: src/external/bsd/openldap/include/ldap_features.h
diff -u src/external/bsd/openldap/include/ldap_features.h:1.2 src/external/bsd/openldap/include/ldap_features.h:1.3
--- src/external/bsd/openldap/include/ldap_features.h:1.2	Wed Aug 13 04:44:59 2008
+++ src/external/bsd/openldap/include/ldap_features.h	Mon Mar  8 05:07:40 2010
@@ -1,8 +1,8 @@
-/* include/ldap_features.h.  Generated by configure.  */
-/* $OpenLDAP: pkg/ldap/include/ldap_features.hin,v 1.3.2.3 2008/02/11 23:26:40 kurt Exp $ */
+/* include/ldap_features.h.  Generated from ldap_features.hin by configure.  */
+/* OpenLDAP: pkg/ldap/include/ldap_features.hin,v 1.3.2.4 2009/01/22 00:00:52 kurt Exp */
 /* This work is part of OpenLDAP Software http://www.openldap.org/.
  *
- * Copyright 1998-2008 The OpenLDAP Foundation.
+ * Copyright 1998-2009 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -14,7 +14,7 @@
  * http://www.OpenLDAP.org/license.html.
  */
 
-/*
+/* 
  * LDAP Features
  */
 
@@ -22,10 +22,10 @@
 #define _LDAP_FEATURES_H 1
 
 /* OpenLDAP API version macros */
-#define LDAP_VENDOR_VERSION 20411
+#define LDAP_VENDOR_VERSION 20421
 #define LDAP_VENDOR_VERSION_MAJOR 2
 #define LDAP_VENDOR_VERSION_MINOR 4
-#define LDAP_VENDOR_VERSION_PATCH 11
+#define LDAP_VENDOR_VERSION_PATCH 21
 
 /*
 ** WORK IN PROGRESS!

Index: src/external/bsd/openldap/include/portable.h
diff -u src/external/bsd/openldap/include/portable.h:1.3 src/external/bsd/openldap/include/portable.h:1.4
--- src/external/bsd/openldap/include/portable.h:1.3	Sun Aug 31 10:29:51 2008
+++ src/external/bsd/openldap/include/portable.h	Mon Mar  8 05:07:40 2010
@@ -1,11 +1,11 @@
-/* include/portable.h.  Generated by configure.  */
+/* include/portable.h.  Generated from portable.hin by configure.  */
 /* include/portable.hin.  Generated from configure.in by autoheader.  */
 
 
 /* begin of portable.h.pre */
 /* This work is part of OpenLDAP Software http://www.openldap.org/.
  *
- * Copyright 1998-2008 The OpenLDAP Foundation
+ * Copyright 1998-2009 The OpenLDAP Foundation
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -49,6 +49,9 @@
 /* end of portable.h.pre */
 
 
+/* Define if building universal (internal helper macro) */
+/* #undef AC_APPLE_UNIVERSAL_BUILD */
+
 /* define to use both string.h and strings.h */
 /* #undef BOTH_STRINGS_H */
 
@@ -170,8 +173,10 @@
 /* Define to 1 if you have the fcntl.h header 

CVS commit: src/external/bsd/openldap/man

[Luke Mewburn]

Module Name:src
Committed By:   lukem
Date:   Mon Mar  8 05:08:41 UTC 2010

Modified Files:
src/external/bsd/openldap/man: lber-decode.3 lber-encode.3
lber-memory.3 lber-sockbuf.3 lber-types.3 ldap.3 ldap.conf.5
ldap_abandon.3 ldap_add.3 ldap_bind.3 ldap_compare.3
ldap_controls.3 ldap_delete.3 ldap_error.3
ldap_extended_operation.3 ldap_first_attribute.3 ldap_first_entry.3
ldap_first_message.3 ldap_first_reference.3 ldap_get_dn.3
ldap_get_option.3 ldap_get_values.3 ldap_memory.3 ldap_modify.3
ldap_modrdn.3 ldap_open.3 ldap_parse_reference.3
ldap_parse_result.3 ldap_parse_sort_control.3
ldap_parse_vlv_control.3 ldap_rename.3 ldap_result.3 ldap_schema.3
ldap_search.3 ldap_sort.3 ldap_sync.3 ldap_tls.3 ldap_url.3
ldapcompare.1 ldapdelete.1 ldapmodify.1 ldapmodrdn.1 ldappasswd.1
ldapsearch.1 ldapwhoami.1 ldif.5 slapacl.8 slapadd.8 slapauth.8
slapcat.8 slapd-bdb.5 slapd-config.5 slapd-dnssrv.5 slapd-ldap.5
slapd-ldbm.5 slapd-ldif.5 slapd-meta.5 slapd-monitor.5 slapd-null.5
slapd-passwd.5 slapd-perl.5 slapd-relay.5 slapd-shell.5
slapd-sock.5 slapd-sql.5 slapd.8 slapd.access.5 slapd.backends.5
slapd.conf.5 slapd.overlays.5 slapd.plugin.5 slapdn.8 slapindex.8
slapo-accesslog.5 slapo-auditlog.5 slapo-chain.5 slapo-constraint.5
slapo-dds.5 slapo-dyngroup.5 slapo-dynlist.5 slapo-memberof.5
slapo-pcache.5 slapo-ppolicy.5 slapo-refint.5 slapo-retcode.5
slapo-rwm.5 slapo-syncprov.5 slapo-translucent.5 slapo-unique.5
slapo-valsort.5 slappasswd.8 slaptest.8

Log Message:
Regenerate for OpenLDAP 2.4.21


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/openldap/man/lber-decode.3 \
src/external/bsd/openldap/man/lber-encode.3 \
src/external/bsd/openldap/man/lber-memory.3 \
src/external/bsd/openldap/man/lber-sockbuf.3 \
src/external/bsd/openldap/man/lber-types.3 \
src/external/bsd/openldap/man/ldap.3 \
src/external/bsd/openldap/man/ldap_abandon.3 \
src/external/bsd/openldap/man/ldap_add.3 \
src/external/bsd/openldap/man/ldap_bind.3 \
src/external/bsd/openldap/man/ldap_compare.3 \
src/external/bsd/openldap/man/ldap_controls.3 \
src/external/bsd/openldap/man/ldap_delete.3 \
src/external/bsd/openldap/man/ldap_error.3 \
src/external/bsd/openldap/man/ldap_extended_operation.3 \
src/external/bsd/openldap/man/ldap_first_attribute.3 \
src/external/bsd/openldap/man/ldap_first_entry.3 \
src/external/bsd/openldap/man/ldap_first_message.3 \
src/external/bsd/openldap/man/ldap_first_reference.3 \
src/external/bsd/openldap/man/ldap_get_dn.3 \
src/external/bsd/openldap/man/ldap_get_option.3 \
src/external/bsd/openldap/man/ldap_get_values.3 \
src/external/bsd/openldap/man/ldap_memory.3 \
src/external/bsd/openldap/man/ldap_modify.3 \
src/external/bsd/openldap/man/ldap_modrdn.3 \
src/external/bsd/openldap/man/ldap_open.3 \
src/external/bsd/openldap/man/ldap_parse_reference.3 \
src/external/bsd/openldap/man/ldap_parse_result.3 \
src/external/bsd/openldap/man/ldap_parse_sort_control.3 \
src/external/bsd/openldap/man/ldap_parse_vlv_control.3 \
src/external/bsd/openldap/man/ldap_rename.3 \
src/external/bsd/openldap/man/ldap_result.3 \
src/external/bsd/openldap/man/ldap_schema.3 \
src/external/bsd/openldap/man/ldap_search.3 \
src/external/bsd/openldap/man/ldap_sort.3 \
src/external/bsd/openldap/man/ldap_sync.3 \
src/external/bsd/openldap/man/ldap_tls.3 \
src/external/bsd/openldap/man/ldap_url.3 \
src/external/bsd/openldap/man/ldapcompare.1 \
src/external/bsd/openldap/man/ldapdelete.1 \
src/external/bsd/openldap/man/ldapmodify.1 \
src/external/bsd/openldap/man/ldapmodrdn.1 \
src/external/bsd/openldap/man/ldappasswd.1 \
src/external/bsd/openldap/man/ldapsearch.1 \
src/external/bsd/openldap/man/ldapwhoami.1 \
src/external/bsd/openldap/man/ldif.5 \
src/external/bsd/openldap/man/slapacl.8 \
src/external/bsd/openldap/man/slapadd.8 \
src/external/bsd/openldap/man/slapauth.8 \
src/external/bsd/openldap/man/slapcat.8 \
src/external/bsd/openldap/man/slapd-bdb.5 \
src/external/bsd/openldap/man/slapd-config.5 \
src/external/bsd/openldap/man/slapd-dnssrv.5 \
src/external/bsd/openldap/man/slapd-ldap.5 \
src/external/bsd/openldap/man/slapd-ldbm.5 \
src/external/bsd/openldap/man/slapd-ldif.5 \
src/external/bsd/openldap/man/slapd-meta.5 \
src/external/bsd/openldap/man/slapd-monitor.5 \
src/external/bsd/openldap/man/slapd-null.5 \
src/external/bsd/openldap/man/slapd-passwd.5 \
src/external/bsd/openldap/man/slapd-perl.5 \
src/external/bsd/openldap/man/slapd-relay.5 \
src/external/bsd/openldap/man/slapd-shell.5 \

CVS commit: src/external/bsd/openldap/man

[Luke Mewburn]

Module Name:src
Committed By:   lukem
Date:   Mon Mar  8 05:11:20 UTC 2010

Added Files:
src/external/bsd/openldap/man: ldapexop.1 ldapurl.1 slapd-ndb.5
slapo-collect.5 slapo-sssvlv.5 slapschema.8

Log Message:
Man pages added in 2.4.21


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/external/bsd/openldap/man/ldapexop.1 \
src/external/bsd/openldap/man/ldapurl.1 \
src/external/bsd/openldap/man/slapd-ndb.5 \
src/external/bsd/openldap/man/slapo-collect.5 \
src/external/bsd/openldap/man/slapo-sssvlv.5 \
src/external/bsd/openldap/man/slapschema.8

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/external/bsd/openldap

[Luke Mewburn]

Module Name:src
Committed By:   lukem
Date:   Mon Mar  8 05:17:25 UTC 2010

Modified Files:
src/external/bsd/openldap: openldap.mk

Log Message:
version is now 2.4.21


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/openldap/openldap.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/external/bsd/openldap/lib/libldap

[Luke Mewburn]

Module Name:src
Committed By:   lukem
Date:   Mon Mar  8 05:18:17 UTC 2010

Modified Files:
src/external/bsd/openldap/lib/libldap: Makefile.libldap

Log Message:
update for .c changes in 2.4.21


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 \
src/external/bsd/openldap/lib/libldap/Makefile.libldap

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/external/bsd/openldap/lib/libldap

[Luke Mewburn]

Module Name:src
Committed By:   lukem
Date:   Mon Mar  8 05:18:17 UTC 2010

Modified Files:
src/external/bsd/openldap/lib/libldap: Makefile.libldap

Log Message:
update for .c changes in 2.4.21


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 \
src/external/bsd/openldap/lib/libldap/Makefile.libldap

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/openldap/lib/libldap/Makefile.libldap
diff -u src/external/bsd/openldap/lib/libldap/Makefile.libldap:1.5 src/external/bsd/openldap/lib/libldap/Makefile.libldap:1.6
--- src/external/bsd/openldap/lib/libldap/Makefile.libldap:1.5	Mon Jul 20 15:41:55 2009
+++ src/external/bsd/openldap/lib/libldap/Makefile.libldap	Mon Mar  8 05:18:17 2010
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.libldap,v 1.5 2009/07/20 15:41:55 christos Exp $
+#	$NetBSD: Makefile.libldap,v 1.6 2010/03/08 05:18:17 lukem Exp $
 
 .include ../../openldap.mk
 
@@ -8,17 +8,17 @@
 SRCS+=		bind.c open.c result.c error.c compare.c search.c \
 		controls.c messages.c references.c extended.c cyrus.c \
 		modify.c add.c modrdn.c delete.c abandon.c \
-		sasl.c sbind.c unbind.c cancel.c \
+		sasl.c gssapi.c sbind.c unbind.c cancel.c \
 		filter.c free.c sort.c passwd.c whoami.c \
 		getdn.c getentry.c getattr.c getvalues.c addentry.c \
 		request.c os-ip.c url.c pagectrl.c sortctrl.c vlvctrl.c \
 		init.c options.c print.c string.c util-int.c schema.c \
 		charray.c os-local.c dnssrv.c utf-8.c utf-8-conv.c \
 		turn.c ppolicy.c dds.c txn.c ldap_sync.c stctrl.c \
-		assertion.c
+		assertion.c deref.c
 
 .if ${MKCRYPTO} != no
-SRCS+=		tls.c 
+SRCS+=		tls2.c tls_o.c tls_g.c tls_m.c
 .endif
 
 CPPFLAGS+=	-DLDAP_LIBRARY

CVS commit: src/external/bsd/openldap/lib/liblutil

[Luke Mewburn]

Module Name:src
Committed By:   lukem
Date:   Mon Mar  8 05:19:10 UTC 2010

Modified Files:
src/external/bsd/openldap/lib/liblutil: Makefile

Log Message:
add meter.c


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/openldap/lib/liblutil/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/openldap/lib/liblutil/Makefile
diff -u src/external/bsd/openldap/lib/liblutil/Makefile:1.2 src/external/bsd/openldap/lib/liblutil/Makefile:1.3
--- src/external/bsd/openldap/lib/liblutil/Makefile:1.2	Tue May 27 08:58:26 2008
+++ src/external/bsd/openldap/lib/liblutil/Makefile	Mon Mar  8 05:19:10 2010
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.2 2008/05/27 08:58:26 lukem Exp $
+#	$NetBSD: Makefile,v 1.3 2010/03/08 05:19:10 lukem Exp $
 
 USE_FORT?=	yes
 
@@ -13,7 +13,7 @@
 
 SRCS=		base64.c csn.c entropy.c sasl.c signal.c hash.c passfile.c \
 		md5.c passwd.c sha1.c getpass.c lockf.c utils.c uuid.c \
-		sockpair.c avl.c tavl.c ldif.c fetch.c \
+		sockpair.c avl.c tavl.c ldif.c fetch.c meter.c \
 		getpeereid.c detach.c
 
 .include bsd.lib.mk

CVS commit: src/external/bsd/openldap/lib/liblutil

[Luke Mewburn]

Module Name:src
Committed By:   lukem
Date:   Mon Mar  8 05:19:10 UTC 2010

Modified Files:
src/external/bsd/openldap/lib/liblutil: Makefile

Log Message:
add meter.c


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/openldap/lib/liblutil/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/external/bsd/openldap/bin

[Luke Mewburn]

Module Name:src
Committed By:   lukem
Date:   Mon Mar  8 05:23:41 UTC 2010

Modified Files:
src/external/bsd/openldap/bin: Makefile.inc

Log Message:
support building without common.c (for ldapurl)


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/openldap/bin/Makefile.inc

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/external/bsd/openldap/bin/ldapexop

[Luke Mewburn]

Module Name:src
Committed By:   lukem
Date:   Mon Mar  8 05:24:33 UTC 2010

Modified Files:
src/external/bsd/openldap/bin/ldapexop: Makefile

Log Message:
ldapexop now has a man page


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/openldap/bin/ldapexop/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/openldap/bin/ldapexop/Makefile
diff -u src/external/bsd/openldap/bin/ldapexop/Makefile:1.1 src/external/bsd/openldap/bin/ldapexop/Makefile:1.2
--- src/external/bsd/openldap/bin/ldapexop/Makefile:1.1	Thu May 22 13:57:47 2008
+++ src/external/bsd/openldap/bin/ldapexop/Makefile	Mon Mar  8 05:24:33 2010
@@ -1,6 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 2008/05/22 13:57:47 lukem Exp $
-
-NOMAN=	#defined
+#	$NetBSD: Makefile,v 1.2 2010/03/08 05:24:33 lukem Exp $
 
 PROG=	ldapexop
 

CVS commit: src/external/bsd/openldap/bin

[Luke Mewburn]

Module Name:src
Committed By:   lukem
Date:   Mon Mar  8 05:25:00 UTC 2010

Modified Files:
src/external/bsd/openldap/bin: Makefile
Added Files:
src/external/bsd/openldap/bin/ldapurl: Makefile

Log Message:
build ldapurl


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/openldap/bin/Makefile
cvs rdiff -u -r0 -r1.1 src/external/bsd/openldap/bin/ldapurl/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/external/bsd/openldap/lib

[Luke Mewburn]

Module Name:src
Committed By:   lukem
Date:   Mon Mar  8 05:45:24 UTC 2010

Modified Files:
src/external/bsd/openldap/lib/liblber: shlib_version
src/external/bsd/openldap/lib/libldap: shlib_version
src/external/bsd/openldap/lib/libldap_r: shlib_version

Log Message:
bump minor version for 2.4.21


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/openldap/lib/liblber/shlib_version
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/openldap/lib/libldap/shlib_version
cvs rdiff -u -r1.3 -r1.4 \
src/external/bsd/openldap/lib/libldap_r/shlib_version

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/external/bsd/openldap

[Luke Mewburn]

Module Name:src
Committed By:   lukem
Date:   Mon Mar  8 06:42:31 UTC 2010

Added Files:
src/external/bsd/openldap: openldap2netbsd

Log Message:
openldap2netbsd - script to munge rcsids, and otherwise prepare for import


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/external/bsd/openldap/openldap2netbsd

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Added files:

Index: src/external/bsd/openldap/openldap2netbsd
diff -u /dev/null src/external/bsd/openldap/openldap2netbsd:1.1
--- /dev/null	Mon Mar  8 06:42:31 2010
+++ src/external/bsd/openldap/openldap2netbsd	Mon Mar  8 06:42:31 2010
@@ -0,0 +1,67 @@
+#! /bin/sh
+#
+#	$NetBSD: openldap2netbsd,v 1.1 2010/03/08 06:42:31 lukem Exp $
+#
+# Copyright (c) 1998, 1999, 2010 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#notice, this list of conditions and the following disclaimer in the
+#documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
+# openldap2netbsd:  convert an openldap source tree into a
+# netbsd openldap source tree, under src/external/bsd/openldap/dist.
+#
+
+d=. #XXX
+
+### Remove the $'s around RCS tags
+find $d -type f -print | xargs egrep -l '\$(Id|OpenLDAP|FreeBSD|OpenBSD)' | \
+while read f; do
+	sed -e 's/\$\(Id.*\) \$/\1/' \
+	-e 's/\$\(OpenLDAP.*\) \$/\1/' \
+	-e 's/\$\(FreeBSD.*\) \$/\1/' \
+	-e 's/\$\(OpenBSD.*\) \$/\1/' \
+	 $f  /tmp/openldap1f$$  mv /tmp/openldap1f$$ $f  \
+	echo removed \$RCS tag from $f
+done
+
+### Add our NetBSD RCS Id
+find $d -name '*.[chly]' -print | while read c; do
+	sed 1q  $c | grep -q '\$NetBSD' || (
+echo /*	\$NetBSD\$	*/ /tmp/openldap3n$$
+echo  /tmp/openldap3n$$
+cat $c   /tmp/openldap3n$$
+mv /tmp/openldap3n$$ $c  echo added NetBSD RCS tag to $c
+	)
+done
+
+echo done
+
+### Fixing file and directory permissions.
+echo Fixing file/directory permissions.
+(
+	cd $d
+	find . -type f -print | xargs chmod u+rw,go+r
+	find . -type d -print | xargs chmod u+rwx,go+rx
+)
+echo done
+
+exit 0

CVS commit: src/external/bsd/openldap

[Luke Mewburn]

Module Name:src
Committed By:   lukem
Date:   Mon Mar  8 06:43:18 UTC 2010

Modified Files:
src/external/bsd/openldap: TODO

Log Message:
fixed rcsids on 2.4.21 import


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/openldap/TODO

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/external/bsd/openldap

[Luke Mewburn]

Module Name:src
Committed By:   lukem
Date:   Mon Mar  8 06:43:18 UTC 2010

Modified Files:
src/external/bsd/openldap: TODO

Log Message:
fixed rcsids on 2.4.21 import


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/openldap/TODO

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/openldap/TODO
diff -u src/external/bsd/openldap/TODO:1.1 src/external/bsd/openldap/TODO:1.2
--- src/external/bsd/openldap/TODO:1.1	Wed Aug 13 04:46:08 2008
+++ src/external/bsd/openldap/TODO	Mon Mar  8 06:43:18 2010
@@ -1,7 +1,4 @@
-#	$NetBSD: TODO,v 1.1 2008/08/13 04:46:08 lukem Exp $
-
-provide an openldap2netbsd conversion script
-(libraries/liblunicode needs $Id: TODO,v 1.1 2008/08/13 04:46:08 lukem Exp $ fixing)
+#	$NetBSD: TODO,v 1.2 2010/03/08 06:43:18 lukem Exp $
 
 install ldap.conf ?