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 <bsd.subdir.mk>
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 <bsd.subdir.mk>
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 <bsd.init.mk>
+
+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 <bsd.lib.mk>
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 <bsd.init.mk>
+
+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 <bsd.lib.mk>
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 12:05:44 2021
@@ -0,0 +1,22 @@
+# $NetBSD: Makefile,v 1.1 2021/12/28 17:05:44 christos Exp $
+
+USE_FORT=yes
+LIBISPRIVATE=yes
+
+.include <bsd.init.mk>
+
+LIB=back_monitor
+
+SLAPD= ${LDAP_DISTDIR}/servers/slapd
+BACK_MONITOR=${SLAPD}/back-monitor
+.PATH: ${BACK_MONITOR}
+
+CPPFLAGS+=-I${SLAPD} -I${BACK_MONITOR}
+
+SRCS += \
+ backend.c bind.c cache.c compare.c conn.c database.c entry.c init.c \
+ listener.c log.c modify.c operation.c operational.c overlay.c rww.c \
+ search.c sent.c thread.c time.c version.c
+
+
+.include <bsd.lib.mk>
Index: src/external/bsd/openldap/lib/slapd/back-relay/Makefile
diff -u /dev/null src/external/bsd/openldap/lib/slapd/back-relay/Makefile:1.1
--- /dev/null Tue Dec 28 12:05:45 2021
+++ src/external/bsd/openldap/lib/slapd/back-relay/Makefile Tue Dec 28 12:05:44 2021
@@ -0,0 +1,20 @@
+# $NetBSD: Makefile,v 1.1 2021/12/28 17:05:44 christos Exp $
+
+USE_FORT=yes
+LIBISPRIVATE=yes
+
+.include <bsd.init.mk>
+
+LIB=back_relay
+
+SLAPD= ${LDAP_DISTDIR}/servers/slapd
+BACK_RELAY=${SLAPD}/back-relay
+.PATH: ${BACK_RELAY}
+
+CPPFLAGS+=-I${SLAPD} -I${BACK_RELAY}
+
+SRCS += \
+ init.c op.c version.c
+
+
+.include <bsd.lib.mk>
Index: src/external/bsd/openldap/lib/slapd/overlays/Makefile
diff -u /dev/null src/external/bsd/openldap/lib/slapd/overlays/Makefile:1.1
--- /dev/null Tue Dec 28 12:05:45 2021
+++ src/external/bsd/openldap/lib/slapd/overlays/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 <bsd.init.mk>
+
+LIB=overlays
+
+SLAPD= ${LDAP_DISTDIR}/servers/slapd
+OVERLAYS=${SLAPD}/overlays
+.PATH: ${OVERLAYS}
+
+CPPFLAGS+=-I${SLAPD} -I${OVERLAYS} -DSLAPD_IMPORT -DSLAPD_OVER_SYNCPROV
+
+SRCS += \
+ overlays.c statover.c syncprov.c
+
+.include <bsd.lib.mk>
Index: src/external/bsd/openldap/lib/slapd/overlays/statover.c
diff -u /dev/null src/external/bsd/openldap/lib/slapd/overlays/statover.c:1.1
--- /dev/null Tue Dec 28 12:05:45 2021
+++ src/external/bsd/openldap/lib/slapd/overlays/statover.c Tue Dec 28 12:05:44 2021
@@ -0,0 +1,26 @@
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2021 The OpenLDAP Foundation.
+ * All rights reserved.
+ *
+ * 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
+ * <http://www.OpenLDAP.org/license.html>.
+ */
+/* This file is automatically generated by configure; please do not edit. */
+
+#include "portable.h"
+#include "slap.h"
+
+extern OV_init syncprov_initialize;
+
+OverlayInit slap_oinfo[] = {
+ { "syncprov", syncprov_initialize },
+ { NULL, NULL },
+};
+
+/* end of generated file */
Index: src/external/bsd/openldap/sbin/Makefile.inc
diff -u /dev/null src/external/bsd/openldap/sbin/Makefile.inc:1.1
--- /dev/null Tue Dec 28 12:05:45 2021
+++ src/external/bsd/openldap/sbin/Makefile.inc Tue Dec 28 12:05:44 2021
@@ -0,0 +1,15 @@
+# $NetBSD: Makefile.inc,v 1.1 2021/12/28 17:05:44 christos Exp $
+
+.include "../openldap.mk"
+
+BINDIR= /usr/sbin
+
+LDADD+= -L${LDAPOBJDIR.rewrite} -lrewrite
+DPADD+= ${LDAPLIB.rewrite}
+LDADD+= -L${LDAPOBJDIR.lunicode} -llunicode
+DPADD+= ${LDAPLIB.lunicode}
+LDADD+= -L${LDAPOBJDIR.lutil} -llutil
+DPADD+= ${LDAPLIB.lutil}
+
+LDADD+= -lldap_r ${LIBLDAP_LDADD}
+DPADD+= ${LIBLDAP_DPADD}
Index: src/external/bsd/openldap/sbin/slapd/Makefile
diff -u /dev/null src/external/bsd/openldap/sbin/slapd/Makefile:1.1
--- /dev/null Tue Dec 28 12:05:45 2021
+++ src/external/bsd/openldap/sbin/slapd/Makefile Tue Dec 28 12:05:44 2021
@@ -0,0 +1,54 @@
+# $NetBSD: Makefile,v 1.1 2021/12/28 17:05:44 christos Exp $
+
+.include <bsd.init.mk>
+
+SLAPD= ${LDAP_DISTDIR}/servers/slapd
+.PATH:${SLAPD} ${SLAPD}/back-ldif ${SLAPD}/back-monitor \
+ ${SLAPD}/overlays
+
+CPPFLAGS+=-I${SLAPD} -I${SLAPD}/back-monitor
+
+MAN=slapd.8 slapd.conf.5
+PROG = slapd
+
+SRCS += \
+ main.c globals.c bconfig.c config.c daemon.c \
+ connection.c search.c filter.c add.c cr.c \
+ attr.c entry.c backend.c result.c operation.c \
+ dn.c compare.c modify.c delete.c modrdn.c ch_malloc.c \
+ value.c ava.c bind.c unbind.c abandon.c filterentry.c \
+ phonetic.c acl.c str2filter.c aclparse.c init.c user.c \
+ lock.c controls.c extended.c passwd.c proxyp.c \
+ schema.c schema_check.c schema_init.c schema_prep.c \
+ schemaparse.c ad.c at.c mr.c syntax.c oc.c saslauthz.c \
+ oidm.c starttls.c index.c sets.c referral.c root_dse.c \
+ sasl.c module.c mra.c mods.c sl_malloc.c zn_malloc.c limits.c \
+ operational.c matchedValues.c cancel.c syncrepl.c \
+ backglue.c backover.c ctxcsn.c ldapsync.c frontend.c \
+ slapadd.c slapcat.c slapcommon.c slapdn.c slapindex.c \
+ slappasswd.c slaptest.c slapauth.c slapacl.c component.c \
+ aci.c txn.c slapschema.c slapmodify.c
+
+SRCS+= backends.c
+
+PROGDPLIBS+= \
+ back_ldif ${.CURDIR}/../../lib/slapd/back-ldif \
+ back_mdb ${.CURDIR}/../../lib/slapd/back-mdb \
+ back_monitor ${.CURDIR}/../../lib/slapd/back-monitor \
+ back_relay ${.CURDIR}/../../lib/slapd/back-relay \
+ overlays ${.CURDIR}/../../lib/slapd/overlays \
+ lunicode ${.CURDIR}/../../lib/liblunicode \
+ rewrite ${.CURDIR}/../../lib/librewrite
+
+__makeman: .USE
+ ${_MKTARGET_CREATE}
+ ${TOOL_SED} -e s@LIBEXECDIR@/usr/sbin@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
+
+.include <bsd.prog.mk>
Index: src/external/bsd/openldap/sbin/slapd/backends.c
diff -u /dev/null src/external/bsd/openldap/sbin/slapd/backends.c:1.1
--- /dev/null Tue Dec 28 12:05:45 2021
+++ src/external/bsd/openldap/sbin/slapd/backends.c Tue Dec 28 12:05:44 2021
@@ -0,0 +1,34 @@
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2021 The OpenLDAP Foundation.
+ * All rights reserved.
+ *
+ * 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
+ * <http://www.OpenLDAP.org/license.html>.
+ */
+/* This file is automatically generated by configure; please do not edit. */
+
+#include "portable.h"
+#include "slap.h"
+
+extern BI_init config_back_initialize;
+extern BI_init ldif_back_initialize;
+extern BI_init monitor_back_initialize;
+extern BI_init mdb_back_initialize;
+extern BI_init relay_back_initialize;
+
+BackendInfo slap_binfo[] = {
+ { "config", config_back_initialize },
+ { "ldif", ldif_back_initialize },
+ { "monitor", monitor_back_initialize },
+ { "mdb", mdb_back_initialize },
+ { "relay", relay_back_initialize },
+ { NULL, NULL },
+};
+
+/* end of generated file */
