diff -urN openldap-2.4.25/configure.in openldap-2.4.25-contrib/configure.in
--- openldap-2.4.25/configure.in	2011-03-24 02:18:25.000000000 +0100
+++ openldap-2.4.25-contrib/configure.in	2011-03-28 17:59:14.569152000 +0200
@@ -3188,6 +3188,28 @@
 [servers/slapd/shell-backends/Makefile:build/top.mk:servers/slapd/shell-backends/Makefile.in:build/srv.mk]
 [servers/slapd/slapi/Makefile:build/top.mk:servers/slapd/slapi/Makefile.in:build/lib.mk:build/lib-shared.mk]
 [servers/slapd/overlays/Makefile:build/top.mk:servers/slapd/overlays/Makefile.in:build/lib.mk]
+[contrib/slapd-modules/Makefile:build/top.mk:contrib/slapd-modules/Makefile.in:build/dir.mk]
+[contrib/slapd-modules/acl/Makefile:build/top.mk:contrib/slapd-modules/acl/Makefile.in:build/mod.mk]
+[contrib/slapd-modules/addpartial/Makefile:build/top.mk:contrib/slapd-modules/addpartial/Makefile.in:build/mod.mk]
+[contrib/slapd-modules/allop/Makefile:build/top.mk:contrib/slapd-modules/allop/Makefile.in:build/mod.mk:build/man.mk]
+[contrib/slapd-modules/allowed/Makefile:build/top.mk:contrib/slapd-modules/allowed/Makefile.in:build/mod.mk]
+[contrib/slapd-modules/autogroup/Makefile:build/top.mk:contrib/slapd-modules/autogroup/Makefile.in:build/mod.mk]
+[contrib/slapd-modules/cloak/Makefile:build/top.mk:contrib/slapd-modules/cloak/Makefile.in:build/mod.mk:build/man.mk]
+[contrib/slapd-modules/comp_match/Makefile:build/top.mk:contrib/slapd-modules/comp_match/Makefile.in:build/mod.mk]
+[contrib/slapd-modules/denyop/Makefile:build/top.mk:contrib/slapd-modules/denyop/Makefile.in:build/mod.mk]
+[contrib/slapd-modules/dsaschema/Makefile:build/top.mk:contrib/slapd-modules/dsaschema/Makefile.in:build/mod.mk]
+[contrib/slapd-modules/dupent/Makefile:build/top.mk:contrib/slapd-modules/dupent/Makefile.in:build/mod.mk]
+[contrib/slapd-modules/kinit/Makefile:build/top.mk:contrib/slapd-modules/kinit/Makefile.in:build/mod.mk]
+[contrib/slapd-modules/lastbind/Makefile:build/top.mk:contrib/slapd-modules/lastbind/Makefile.in:build/mod.mk:build/man.mk]
+[contrib/slapd-modules/lastmod/Makefile:build/top.mk:contrib/slapd-modules/lastmod/Makefile.in:build/mod.mk:build/man.mk]
+[contrib/slapd-modules/noopsrch/Makefile:build/top.mk:contrib/slapd-modules/noopsrch/Makefile.in:build/mod.mk]
+[contrib/slapd-modules/nops/Makefile:build/top.mk:contrib/slapd-modules/nops/Makefile.in:build/mod.mk:build/man.mk]
+[contrib/slapd-modules/nssov/Makefile:build/top.mk:contrib/slapd-modules/nssov/Makefile.in:build/mod.mk:build/man.mk]
+[contrib/slapd-modules/passwd/Makefile:build/top.mk:contrib/slapd-modules/passwd/Makefile.in:build/lib.mk]
+[contrib/slapd-modules/proxyOld/Makefile:build/top.mk:contrib/slapd-modules/proxyOld/Makefile.in:build/mod.mk]
+[contrib/slapd-modules/samba4/Makefile:build/top.mk:contrib/slapd-modules/samba4/Makefile.in:build/lib.mk]
+[contrib/slapd-modules/smbk5pwd/Makefile:build/top.mk:contrib/slapd-modules/smbk5pwd/Makefile.in:build/mod.mk]
+[contrib/slapd-modules/trace/Makefile:build/top.mk:contrib/slapd-modules/trace/Makefile.in:build/mod.mk]
 [tests/Makefile:build/top.mk:tests/Makefile.in:build/dir.mk]
 [tests/run]
 [tests/progs/Makefile:build/top.mk:tests/progs/Makefile.in:build/rules.mk])
diff -urN openldap-2.4.25/contrib/slapd-modules/acl/Makefile.in openldap-2.4.25-contrib/contrib/slapd-modules/acl/Makefile.in
--- openldap-2.4.25/contrib/slapd-modules/acl/Makefile.in	1970-01-01 01:00:00.000000000 +0100
+++ openldap-2.4.25-contrib/contrib/slapd-modules/acl/Makefile.in	2011-03-28 17:51:20.119152000 +0200
@@ -0,0 +1,20 @@
+BUILD_MOD = mod
+
+SRCS = posixgroup.c
+
+OBJS = posixgroup.lo
+
+LIBBASE = acl-posixgroup
+
+LDAP_INCDIR= ../../../include       
+LDAP_LIBDIR= ../../../libraries
+
+MOD_DEFS = -DSLAPD_IMPORT
+#MOD_LIBS = 
+
+shared_LDAP_LIBS = $(LDAP_LIBLDAP_R_LA) $(LDAP_LIBLBER_LA)
+NT_LINK_LIBS = -L.. -lslapd $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS)
+UNIX_LINK_LIBS = $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS)
+
+XINCPATH = -I. -I$(srcdir)/. -I../../../servers/slapd
+XDEFS = $(MODULES_CPPFLAGS)
diff -urN openldap-2.4.25/contrib/slapd-modules/addpartial/Makefile.in openldap-2.4.25-contrib/contrib/slapd-modules/addpartial/Makefile.in
--- openldap-2.4.25/contrib/slapd-modules/addpartial/Makefile.in	1970-01-01 01:00:00.000000000 +0100
+++ openldap-2.4.25-contrib/contrib/slapd-modules/addpartial/Makefile.in	2011-03-28 17:51:20.122152000 +0200
@@ -0,0 +1,20 @@
+BUILD_MOD = mod
+
+SRCS = addpartial-overlay.c
+
+OBJS = addpartial-overlay.lo
+
+LIBBASE = addpartial-overlay
+
+LDAP_INCDIR= ../../../include       
+LDAP_LIBDIR= ../../../libraries
+
+MOD_DEFS = -DSLAPD_IMPORT
+#MOD_LIBS = 
+
+shared_LDAP_LIBS = $(LDAP_LIBLDAP_R_LA) $(LDAP_LIBLBER_LA)
+NT_LINK_LIBS = -L.. -lslapd $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS)
+UNIX_LINK_LIBS = $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS)
+
+XINCPATH = -I. -I$(srcdir)/. -I../../../servers/slapd
+XDEFS = $(MODULES_CPPFLAGS)
diff -urN openldap-2.4.25/contrib/slapd-modules/allop/Makefile.in openldap-2.4.25-contrib/contrib/slapd-modules/allop/Makefile.in
--- openldap-2.4.25/contrib/slapd-modules/allop/Makefile.in	1970-01-01 01:00:00.000000000 +0100
+++ openldap-2.4.25-contrib/contrib/slapd-modules/allop/Makefile.in	2011-03-28 19:59:06.534991161 +0200
@@ -0,0 +1,22 @@
+BUILD_MOD = mod
+
+SRCS = allop.c
+
+OBJS = allop.lo
+
+LIBBASE = allop
+
+LDAP_INCDIR= ../../../include       
+LDAP_LIBDIR= ../../../libraries
+
+MOD_DEFS = -DSLAPD_IMPORT
+#MOD_LIBS = 
+
+shared_LDAP_LIBS = $(LDAP_LIBLDAP_R_LA) $(LDAP_LIBLBER_LA)
+NT_LINK_LIBS = -L.. -lslapd $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS)
+UNIX_LINK_LIBS = $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS)
+
+XINCPATH = -I. -I$(srcdir)/. -I../../../servers/slapd
+XDEFS = $(MODULES_CPPFLAGS)
+
+MANSECT=5
diff -urN openldap-2.4.25/contrib/slapd-modules/allowed/Makefile.in openldap-2.4.25-contrib/contrib/slapd-modules/allowed/Makefile.in
--- openldap-2.4.25/contrib/slapd-modules/allowed/Makefile.in	1970-01-01 01:00:00.000000000 +0100
+++ openldap-2.4.25-contrib/contrib/slapd-modules/allowed/Makefile.in	2011-03-28 17:51:20.127152000 +0200
@@ -0,0 +1,20 @@
+BUILD_MOD = mod
+
+SRCS = allowed.c
+
+OBJS = allowed.lo
+
+LIBBASE = allowed
+
+LDAP_INCDIR= ../../../include       
+LDAP_LIBDIR= ../../../libraries
+
+MOD_DEFS = -DSLAPD_IMPORT -DSLAPD_OVER_ALLOWED=SLAPD_MOD_DYNAMIC
+#MOD_LIBS = 
+
+shared_LDAP_LIBS = $(LDAP_LIBLDAP_R_LA) $(LDAP_LIBLBER_LA)
+NT_LINK_LIBS = -L.. -lslapd $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS)
+UNIX_LINK_LIBS = $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS)
+
+XINCPATH = -I. -I$(srcdir)/. -I../../../servers/slapd
+XDEFS = $(MODULES_CPPFLAGS)
diff -urN openldap-2.4.25/contrib/slapd-modules/autogroup/Makefile.in openldap-2.4.25-contrib/contrib/slapd-modules/autogroup/Makefile.in
--- openldap-2.4.25/contrib/slapd-modules/autogroup/Makefile.in	1970-01-01 01:00:00.000000000 +0100
+++ openldap-2.4.25-contrib/contrib/slapd-modules/autogroup/Makefile.in	2011-03-28 17:51:20.127152000 +0200
@@ -0,0 +1,20 @@
+BUILD_MOD = mod
+
+SRCS = autogroup.c
+
+OBJS = autogroup.lo
+
+LIBBASE = autogroup
+
+LDAP_INCDIR= ../../../include       
+LDAP_LIBDIR= ../../../libraries
+
+MOD_DEFS = -DSLAPD_IMPORT
+#MOD_LIBS = 
+
+shared_LDAP_LIBS = $(LDAP_LIBLDAP_R_LA) $(LDAP_LIBLBER_LA)
+NT_LINK_LIBS = -L.. -lslapd $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS)
+UNIX_LINK_LIBS = $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS)
+
+XINCPATH = -I. -I$(srcdir)/. -I../../../servers/slapd
+XDEFS = $(MODULES_CPPFLAGS)
diff -urN openldap-2.4.25/contrib/slapd-modules/cloak/Makefile.in openldap-2.4.25-contrib/contrib/slapd-modules/cloak/Makefile.in
--- openldap-2.4.25/contrib/slapd-modules/cloak/Makefile.in	1970-01-01 01:00:00.000000000 +0100
+++ openldap-2.4.25-contrib/contrib/slapd-modules/cloak/Makefile.in	2011-03-28 19:59:11.461991161 +0200
@@ -0,0 +1,22 @@
+BUILD_MOD = mod
+
+SRCS = cloak.c
+
+OBJS = cloak.lo
+
+LIBBASE = cloak
+
+LDAP_INCDIR= ../../../include       
+LDAP_LIBDIR= ../../../libraries
+
+MOD_DEFS = -DSLAPD_IMPORT -DSLAPD_OVER_CLOAK=SLAPD_MOD_DYNAMIC
+#MOD_LIBS = 
+
+shared_LDAP_LIBS = $(LDAP_LIBLDAP_R_LA) $(LDAP_LIBLBER_LA)
+NT_LINK_LIBS = -L.. -lslapd $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS)
+UNIX_LINK_LIBS = $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS)
+
+XINCPATH = -I. -I$(srcdir)/. -I../../../servers/slapd
+XDEFS = $(MODULES_CPPFLAGS)
+
+MANSECT=5
diff -urN openldap-2.4.25/contrib/slapd-modules/comp_match/Makefile.in openldap-2.4.25-contrib/contrib/slapd-modules/comp_match/Makefile.in
--- openldap-2.4.25/contrib/slapd-modules/comp_match/Makefile.in	1970-01-01 01:00:00.000000000 +0100
+++ openldap-2.4.25-contrib/contrib/slapd-modules/comp_match/Makefile.in	2011-03-28 17:51:20.128152000 +0200
@@ -0,0 +1,28 @@
+BUILD_MOD = mod
+
+SRCS = asn_to_syn_mr.c authorityKeyIdentifier.c certificate.c \
+	componentlib.c crl.c init.c
+
+OBJS = asn_to_syn_mr.lo authorityKeyIdentifier.lo certificate.lo \
+	componentlib.lo crl.lo init.lo
+
+LIBBASE = compmatch
+
+OPENSSL_INC = -I/usr/include/openssl
+OPENSSL_LIBS = -lcrypto
+
+SNACC_INC =-I/usr/include/snacc -I/usr/include/snacc/c-lib/inc
+SNACC_LIBS = -lcasn1
+
+LDAP_INCDIR= ../../../include       
+LDAP_LIBDIR= ../../../libraries
+
+MOD_DEFS = -DSLAPD_IMPORT -DLDAP_COMPONENT $(OPENSSL_INC) $(SNACC_INC)
+MOD_LIBS = $(OPENSSL_LIBS) $(SNACC_LIBS)
+
+shared_LDAP_LIBS = $(LDAP_LIBLDAP_R_LA) $(LDAP_LIBLBER_LA)
+NT_LINK_LIBS = -L.. -lslapd $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS)
+UNIX_LINK_LIBS = $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS)
+
+XINCPATH = -I. -I$(srcdir)/. -I../../../servers/slapd
+XDEFS = $(MODULES_CPPFLAGS)
diff -urN openldap-2.4.25/contrib/slapd-modules/denyop/Makefile.in openldap-2.4.25-contrib/contrib/slapd-modules/denyop/Makefile.in
--- openldap-2.4.25/contrib/slapd-modules/denyop/Makefile.in	1970-01-01 01:00:00.000000000 +0100
+++ openldap-2.4.25-contrib/contrib/slapd-modules/denyop/Makefile.in	2011-03-28 17:51:20.128152000 +0200
@@ -0,0 +1,20 @@
+BUILD_MOD = mod
+
+SRCS = denyop.c
+
+OBJS = denyop.lo
+
+LIBBASE = denyop
+
+LDAP_INCDIR= ../../../include       
+LDAP_LIBDIR= ../../../libraries
+
+MOD_DEFS = -DSLAPD_IMPORT -DSLAPD_OVER_DENYOP=SLAPD_MOD_DYNAMIC
+#MOD_LIBS = 
+
+shared_LDAP_LIBS = $(LDAP_LIBLDAP_R_LA) $(LDAP_LIBLBER_LA)
+NT_LINK_LIBS = -L.. -lslapd $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS)
+UNIX_LINK_LIBS = $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS)
+
+XINCPATH = -I. -I$(srcdir)/. -I../../../servers/slapd
+XDEFS = $(MODULES_CPPFLAGS)
diff -urN openldap-2.4.25/contrib/slapd-modules/dsaschema/Makefile.in openldap-2.4.25-contrib/contrib/slapd-modules/dsaschema/Makefile.in
--- openldap-2.4.25/contrib/slapd-modules/dsaschema/Makefile.in	1970-01-01 01:00:00.000000000 +0100
+++ openldap-2.4.25-contrib/contrib/slapd-modules/dsaschema/Makefile.in	2011-03-28 17:51:20.129152000 +0200
@@ -0,0 +1,20 @@
+BUILD_MOD = mod
+
+SRCS = dsaschema.c
+
+OBJS = dsaschema.lo
+
+LIBBASE = dsaschema
+
+LDAP_INCDIR= ../../../include       
+LDAP_LIBDIR= ../../../libraries
+
+MOD_DEFS = -DSLAPD_IMPORT
+#MOD_LIBS = 
+
+shared_LDAP_LIBS = $(LDAP_LIBLDAP_R_LA) $(LDAP_LIBLBER_LA)
+NT_LINK_LIBS = -L.. -lslapd $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS)
+UNIX_LINK_LIBS = $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS)
+
+XINCPATH = -I. -I$(srcdir)/. -I../../../servers/slapd
+XDEFS = $(MODULES_CPPFLAGS)
diff -urN openldap-2.4.25/contrib/slapd-modules/dupent/Makefile.in openldap-2.4.25-contrib/contrib/slapd-modules/dupent/Makefile.in
--- openldap-2.4.25/contrib/slapd-modules/dupent/Makefile.in	1970-01-01 01:00:00.000000000 +0100
+++ openldap-2.4.25-contrib/contrib/slapd-modules/dupent/Makefile.in	2011-03-28 17:51:20.133152000 +0200
@@ -0,0 +1,20 @@
+BUILD_MOD = mod
+
+SRCS = dupent.c
+
+OBJS = dupent.lo
+
+LIBBASE = dupent
+
+LDAP_INCDIR= ../../../include       
+LDAP_LIBDIR= ../../../libraries
+
+MOD_DEFS = -DSLAPD_IMPORT -DSLAPD_OVER_DUPENT=SLAPD_MOD_DYNAMIC
+#MOD_LIBS = 
+
+shared_LDAP_LIBS = $(LDAP_LIBLDAP_R_LA) $(LDAP_LIBLBER_LA)
+NT_LINK_LIBS = -L.. -lslapd $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS)
+UNIX_LINK_LIBS = $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS)
+
+XINCPATH = -I. -I$(srcdir)/. -I../../../servers/slapd
+XDEFS = $(MODULES_CPPFLAGS)
diff -urN openldap-2.4.25/contrib/slapd-modules/kinit/Makefile.in openldap-2.4.25-contrib/contrib/slapd-modules/kinit/Makefile.in
--- openldap-2.4.25/contrib/slapd-modules/kinit/Makefile.in	1970-01-01 01:00:00.000000000 +0100
+++ openldap-2.4.25-contrib/contrib/slapd-modules/kinit/Makefile.in	2011-03-28 17:51:20.134152000 +0200
@@ -0,0 +1,23 @@
+BUILD_MOD = mod
+
+SRCS = kinit.c
+
+OBJS = kinit.lo
+
+LIBBASE = kinit
+
+LDAP_INCDIR= ../../../include       
+LDAP_LIBDIR= ../../../libraries
+
+KRB5_INC = -I/usr/include/krb5
+KRB5_LIBS = -lkrb5
+
+MOD_DEFS = -DSLAPD_IMPORT $(KRB5_INC)
+MOD_LIBS = $(KRB5_LIBS)
+
+shared_LDAP_LIBS = $(LDAP_LIBLDAP_R_LA) $(LDAP_LIBLBER_LA)
+NT_LINK_LIBS = -L.. -lslapd $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS)
+UNIX_LINK_LIBS = $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS)
+
+XINCPATH = -I. -I$(srcdir)/. -I../../../servers/slapd
+XDEFS = $(MODULES_CPPFLAGS)
diff -urN openldap-2.4.25/contrib/slapd-modules/lastbind/Makefile.in openldap-2.4.25-contrib/contrib/slapd-modules/lastbind/Makefile.in
--- openldap-2.4.25/contrib/slapd-modules/lastbind/Makefile.in	1970-01-01 01:00:00.000000000 +0100
+++ openldap-2.4.25-contrib/contrib/slapd-modules/lastbind/Makefile.in	2011-03-28 19:59:18.355991161 +0200
@@ -0,0 +1,22 @@
+BUILD_MOD = mod
+
+SRCS = lastbind.c
+
+OBJS = lastbind.lo
+
+LIBBASE = lastbind
+
+LDAP_INCDIR= ../../../include       
+LDAP_LIBDIR= ../../../libraries
+
+MOD_DEFS = -DSLAPD_IMPORT -DSLAPD_OVER_LASTBIND=SLAPD_MOD_DYNAMIC
+#MOD_LIBS = 
+
+shared_LDAP_LIBS = $(LDAP_LIBLDAP_R_LA) $(LDAP_LIBLBER_LA)
+NT_LINK_LIBS = -L.. -lslapd $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS)
+UNIX_LINK_LIBS = $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS)
+
+XINCPATH = -I. -I$(srcdir)/. -I../../../servers/slapd
+XDEFS = $(MODULES_CPPFLAGS)
+
+MANSECT=5
diff -urN openldap-2.4.25/contrib/slapd-modules/lastmod/Makefile.in openldap-2.4.25-contrib/contrib/slapd-modules/lastmod/Makefile.in
--- openldap-2.4.25/contrib/slapd-modules/lastmod/Makefile.in	1970-01-01 01:00:00.000000000 +0100
+++ openldap-2.4.25-contrib/contrib/slapd-modules/lastmod/Makefile.in	2011-03-28 19:59:21.783991161 +0200
@@ -0,0 +1,22 @@
+BUILD_MOD = mod
+
+SRCS = lastmod.c
+
+OBJS = lastmod.lo
+
+LIBBASE = lastmod
+
+LDAP_INCDIR= ../../../include       
+LDAP_LIBDIR= ../../../libraries
+
+MOD_DEFS = -DSLAPD_IMPORT -DSLAPD_OVER_LASTMOD=SLAPD_MOD_DYNAMIC
+#MOD_LIBS = 
+
+shared_LDAP_LIBS = $(LDAP_LIBLDAP_R_LA) $(LDAP_LIBLBER_LA)
+NT_LINK_LIBS = -L.. -lslapd $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS)
+UNIX_LINK_LIBS = $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS)
+
+XINCPATH = -I. -I$(srcdir)/. -I../../../servers/slapd
+XDEFS = $(MODULES_CPPFLAGS)
+
+MANSECT=5
diff -urN openldap-2.4.25/contrib/slapd-modules/Makefile.in openldap-2.4.25-contrib/contrib/slapd-modules/Makefile.in
--- openldap-2.4.25/contrib/slapd-modules/Makefile.in	1970-01-01 01:00:00.000000000 +0100
+++ openldap-2.4.25-contrib/contrib/slapd-modules/Makefile.in	2011-03-28 17:51:20.143152000 +0200
@@ -0,0 +1,23 @@
+# Do not build:
+#	acl comp_match passwd
+
+# Needs MIT kerberos:
+#	kinit
+
+SUBDIRS = addpartial \
+	allop \
+	allowed \
+	autogroup \
+	cloak \
+	denyop \
+	dsaschema \
+	dupent \
+	lastbind \
+	lastmod \
+	noopsrch \
+	nops \
+	nssov \
+	proxyOld \
+	samba4 \
+	smbk5pwd \
+	trace
diff -urN openldap-2.4.25/contrib/slapd-modules/noopsrch/Makefile.in openldap-2.4.25-contrib/contrib/slapd-modules/noopsrch/Makefile.in
--- openldap-2.4.25/contrib/slapd-modules/noopsrch/Makefile.in	1970-01-01 01:00:00.000000000 +0100
+++ openldap-2.4.25-contrib/contrib/slapd-modules/noopsrch/Makefile.in	2011-03-28 17:51:20.144152000 +0200
@@ -0,0 +1,20 @@
+BUILD_MOD = mod
+
+SRCS = noopsrch.c
+
+OBJS = noopsrch.lo
+
+LIBBASE = noopsrch
+
+LDAP_INCDIR= ../../../include       
+LDAP_LIBDIR= ../../../libraries
+
+MOD_DEFS = -DSLAPD_IMPORT -DSLAPD_OVER_NOOPSRCH=SLAPD_MOD_DYNAMIC
+#MOD_LIBS = 
+
+shared_LDAP_LIBS = $(LDAP_LIBLDAP_R_LA) $(LDAP_LIBLBER_LA)
+NT_LINK_LIBS = -L.. -lslapd $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS)
+UNIX_LINK_LIBS = $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS)
+
+XINCPATH = -I. -I$(srcdir)/. -I../../../servers/slapd
+XDEFS = $(MODULES_CPPFLAGS)
diff -urN openldap-2.4.25/contrib/slapd-modules/nops/Makefile.in openldap-2.4.25-contrib/contrib/slapd-modules/nops/Makefile.in
--- openldap-2.4.25/contrib/slapd-modules/nops/Makefile.in	1970-01-01 01:00:00.000000000 +0100
+++ openldap-2.4.25-contrib/contrib/slapd-modules/nops/Makefile.in	2011-03-28 19:59:27.566991161 +0200
@@ -0,0 +1,22 @@
+BUILD_MOD = mod
+
+SRCS = nops.c
+
+OBJS = nops.lo
+
+LIBBASE = nops
+
+LDAP_INCDIR= ../../../include       
+LDAP_LIBDIR= ../../../libraries
+
+MOD_DEFS = -DSLAPD_IMPORT -DSLAPD_OVER_NOPS=SLAPD_MOD_DYNAMIC
+#MOD_LIBS = 
+
+shared_LDAP_LIBS = $(LDAP_LIBLDAP_R_LA) $(LDAP_LIBLBER_LA)
+NT_LINK_LIBS = -L.. -lslapd $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS)
+UNIX_LINK_LIBS = $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS)
+
+XINCPATH = -I. -I$(srcdir)/. -I../../../servers/slapd
+XDEFS = $(MODULES_CPPFLAGS)
+
+MANSECT=5
diff -urN openldap-2.4.25/contrib/slapd-modules/nssov/Makefile.in openldap-2.4.25-contrib/contrib/slapd-modules/nssov/Makefile.in
--- openldap-2.4.25/contrib/slapd-modules/nssov/Makefile.in	1970-01-01 01:00:00.000000000 +0100
+++ openldap-2.4.25-contrib/contrib/slapd-modules/nssov/Makefile.in	2011-03-28 19:59:41.531991162 +0200
@@ -0,0 +1,34 @@
+BUILD_MOD = mod
+
+SRCS = nss-pam-ldapd/tio.c alias.c ether.c group.c host.c netgroup.c \
+	network.c nssov.c pam.c passwd.c protocol.c rpc.c service.c \
+	shadow.c
+
+OBJS = tio.lo alias.lo ether.lo group.lo host.lo netgroup.lo \
+	network.lo nssov.lo pam.lo passwd.lo protocol.lo rpc.lo service.lo \
+	shadow.lo
+
+LIBBASE = nssov
+
+LDAP_INCDIR= ../../../include       
+LDAP_LIBDIR= ../../../libraries
+
+MOD_DEFS = -DSLAPD_IMPORT -DSLAPD_OVER_NSSOV=SLAPD_MOD_DYNAMIC
+#MOD_LIBS = 
+
+shared_LDAP_LIBS = $(LDAP_LIBLDAP_R_LA) $(LDAP_LIBLBER_LA)
+NT_LINK_LIBS = -L.. -lslapd $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS)
+UNIX_LINK_LIBS = $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS)
+
+XINCPATH = -I. -I$(srcdir)/. -I../../../servers/slapd -I$(srcdir)/nss-pam-ldapd
+XDEFS = $(MODULES_CPPFLAGS)
+
+MANSECT=5
+
+tio.lo: nss-pam-ldapd/tio.c
+	$(LTCOMPILE_MOD) $<
+
+install-local: FORCE
+	$(MKDIR) $(DESTDIR)$(schemadir)
+	echo $(INSTALL) $(INSTALLFLAGS) -m 444 ldapns.schema $(DESTDIR)$(schemadir)
+	$(INSTALL) $(INSTALLFLAGS) -m 444 $(srcdir)/ldapns.schema $(DESTDIR)$(schemadir)
--- openldap-2.4.27/contrib/slapd-modules/passwd/Makefile.in	1970-01-01 01:00:00.000000000 +0100
+++ openldap-2.4.27-contrib/contrib/slapd-modules/passwd/Makefile.in	2011-03-28 17:51:20.148152000 +0200
@@ -0,0 +1,64 @@
+SRCS = kerberos.c netscape.c radius.c apr1.c
+
+OBJS = kerberos.lo netscape.lo radius.lo apr1.lo
+
+LTONLY_MOD = $(LTONLY_mod)
+LDAP_INCDIR= ../../../include       
+LDAP_LIBDIR= ../../../libraries
+
+KRB5_DEFS = -DHAVE_KRB5
+KRB5_LIBS = -lkrb5
+
+RADIUS_LIBS = -lradius
+
+MOD_DEFS = -DSLAPD_IMPORT $(KRB5_DEFS)
+
+shared_LDAP_LIBS = $(LDAP_LIBLDAP_R_LA) $(LDAP_LIBLBER_LA)
+NT_LINK_LIBS = -L.. -lslapd $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS)
+UNIX_LINK_LIBS = $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS)
+
+LIBRARY = libpasswd.a
+PROGRAMS = kerberos.la netscape.la radius.la apr1.la
+
+XINCPATH = -I.. -I$(srcdir)/.. -I../../../servers/slapd
+XDEFS = $(MODULES_CPPFLAGS)
+
+static:	$(LIBRARY)
+
+dynamic: $(PROGRAMS)
+
+kerberos.la : kerberos.lo
+	$(LTLINK_MOD) -module -o $@ kerberos.lo version.lo $(LINK_LIBS) $(KRB5_LIBS)
+
+netscape.la : netscape.lo
+	$(LTLINK_MOD) -module -o $@ netscape.lo version.lo $(LINK_LIBS)
+
+radius.la : radius.lo
+	$(LTLINK_MOD) -module -o $@ radius.lo version.lo $(LINK_LIBS) $(RADIUS_LIBS)
+
+apr1.la : apr1.lo
+	$(LTLINK_MOD) -module -o $@ apr1.lo version.lo $(LINK_LIBS) $(RADIUS_LIBS)
+
+install-local:	$(PROGRAMS)
+	@if test -n "$?" ; then \
+		$(MKDIR) $(DESTDIR)$(moduledir); \
+		$(LTINSTALL) $(INSTALLFLAGS) -m 755 $? $(DESTDIR)$(moduledir);\
+	fi
+
+MKDEPFLAG = -l
+
+.SUFFIXES: .c .o .lo
+
+.c.lo:
+	$(LTCOMPILE_MOD) $<
+
+$(LIBRARY): $(OBJS) version.lo
+	$(AR) rs $@ $(OBJS)
+
+# Must fixup depends for non-libtool objects
+depend-local: depend-common
+	@if test -n "$(OBJS)"; then \
+	OBJ2=`echo $(OBJS) $(OBJDEP) | $(SED) -e 's/\.o//g'`; \
+	SCR=''; for i in $$OBJ2; do SCR="$$SCR -e s/^$$i.lo:/$$i.o:/"; done; \
+	mv Makefile Makefile.bak; $(SED) $$SCR Makefile.bak > Makefile && \
+	$(RM) Makefile.bak; fi
diff -urN openldap-2.4.25/contrib/slapd-modules/proxyOld/Makefile.in openldap-2.4.25-contrib/contrib/slapd-modules/proxyOld/Makefile.in
--- openldap-2.4.25/contrib/slapd-modules/proxyOld/Makefile.in	1970-01-01 01:00:00.000000000 +0100
+++ openldap-2.4.25-contrib/contrib/slapd-modules/proxyOld/Makefile.in	2011-03-28 17:51:20.149152000 +0200
@@ -0,0 +1,20 @@
+BUILD_MOD = mod
+
+SRCS = proxyOld.c
+
+OBJS = proxyOld.lo
+
+LIBBASE = proxyOld
+
+LDAP_INCDIR= ../../../include       
+LDAP_LIBDIR= ../../../libraries
+
+MOD_DEFS = -DSLAPD_IMPORT
+#MOD_LIBS = 
+
+shared_LDAP_LIBS = $(LDAP_LIBLDAP_R_LA) $(LDAP_LIBLBER_LA)
+NT_LINK_LIBS = -L.. -lslapd $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS)
+UNIX_LINK_LIBS = $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS)
+
+XINCPATH = -I. -I$(srcdir)/. -I../../../servers/slapd
+XDEFS = $(MODULES_CPPFLAGS)
diff -urN openldap-2.4.25/contrib/slapd-modules/samba4/Makefile.in openldap-2.4.25-contrib/contrib/slapd-modules/samba4/Makefile.in
--- openldap-2.4.25/contrib/slapd-modules/samba4/Makefile.in	1970-01-01 01:00:00.000000000 +0100
+++ openldap-2.4.25-contrib/contrib/slapd-modules/samba4/Makefile.in	2011-03-28 17:51:20.150152000 +0200
@@ -0,0 +1,59 @@
+SRCS = pguid.c rdnval.c vernum.c
+
+OBJS = pguid.lo rdnval.lo vernum.lo
+
+LTONLY_MOD = $(LTONLY_mod)
+LDAP_INCDIR= ../../../include       
+LDAP_LIBDIR= ../../../libraries
+
+MOD_DEFS = -DSLAPD_IMPORT \
+	-DSLAPD_OVER_RDNVAL=SLAPD_MOD_DYNAMIC \
+	-DSLAPD_OVER_PGUID=SLAPD_MOD_DYNAMIC \
+	-DSLAPD_OVER_VERNUM=SLAPD_MOD_DYNAMIC
+
+shared_LDAP_LIBS = $(LDAP_LIBLDAP_R_LA) $(LDAP_LIBLBER_LA)
+NT_LINK_LIBS = -L.. -lslapd $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS)
+UNIX_LINK_LIBS = $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS)
+
+LIBRARY = libsamba4.a
+PROGRAMS = pguid.la rdnval.la vernum.la
+
+XINCPATH = -I.. -I$(srcdir)/.. -I../../../servers/slapd
+XDEFS = $(MODULES_CPPFLAGS)
+
+static:	$(LIBRARY)
+
+dynamic: $(PROGRAMS)
+
+pguid.la : pguid.lo version.lo
+	$(LTLINK_MOD) -module -o $@ pguid.lo version.lo $(LINK_LIBS)
+
+rdnval.la : rdnval.lo version.lo
+	$(LTLINK_MOD) -module -o $@ rdnval.lo version.lo $(LINK_LIBS)
+
+vernum.la : vernum.lo version.lo
+	$(LTLINK_MOD) -module -o $@ vernum.lo version.lo $(LINK_LIBS)
+
+install-local:	$(PROGRAMS)
+	@if test -n "$?" ; then \
+		$(MKDIR) $(DESTDIR)$(moduledir); \
+		$(LTINSTALL) $(INSTALLFLAGS) -m 755 $? $(DESTDIR)$(moduledir);\
+	fi
+
+MKDEPFLAG = -l
+
+.SUFFIXES: .c .o .lo
+
+.c.lo:
+	$(LTCOMPILE_MOD) $<
+
+$(LIBRARY): $(OBJS) version.lo
+	$(AR) rs $@ $(OBJS)
+
+# Must fixup depends for non-libtool objects
+depend-local: depend-common
+	@if test -n "$(OBJS)"; then \
+	OBJ2=`echo $(OBJS) $(OBJDEP) | $(SED) -e 's/\.o//g'`; \
+	SCR=''; for i in $$OBJ2; do SCR="$$SCR -e s/^$$i.lo:/$$i.o:/"; done; \
+	mv Makefile Makefile.bak; $(SED) $$SCR Makefile.bak > Makefile && \
+	$(RM) Makefile.bak; fi
diff -urN openldap-2.4.25/contrib/slapd-modules/smbk5pwd/Makefile.in openldap-2.4.25-contrib/contrib/slapd-modules/smbk5pwd/Makefile.in
--- openldap-2.4.25/contrib/slapd-modules/smbk5pwd/Makefile.in	1970-01-01 01:00:00.000000000 +0100
+++ openldap-2.4.25-contrib/contrib/slapd-modules/smbk5pwd/Makefile.in	2011-03-28 17:51:20.152152000 +0200
@@ -0,0 +1,22 @@
+BUILD_MOD = mod
+
+SRCS = smbk5pwd.c
+
+OBJS = smbk5pwd.lo
+
+LIBBASE = smbk5pwd
+
+LDAP_INCDIR= ../../../include       
+LDAP_LIBDIR= ../../../libraries
+
+HEIMDAL_LIBS = -lkrb5 -lkadm5srv
+
+MOD_DEFS = -DSLAPD_IMPORT -DDO_KRB5 -DDO_SAMBA -DDO_SHADOW
+MOD_LIBS = $(HEIMDAL_LIBS)
+
+shared_LDAP_LIBS = $(LDAP_LIBLDAP_R_LA) $(LDAP_LIBLBER_LA)
+NT_LINK_LIBS = -L.. -lslapd $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS)
+UNIX_LINK_LIBS = $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS)
+
+XINCPATH = -I. -I$(srcdir)/. -I../../../servers/slapd
+XDEFS = $(MODULES_CPPFLAGS)
diff -urN openldap-2.4.25/contrib/slapd-modules/trace/Makefile.in openldap-2.4.25-contrib/contrib/slapd-modules/trace/Makefile.in
--- openldap-2.4.25/contrib/slapd-modules/trace/Makefile.in	1970-01-01 01:00:00.000000000 +0100
+++ openldap-2.4.25-contrib/contrib/slapd-modules/trace/Makefile.in	2011-03-28 17:51:20.153152000 +0200
@@ -0,0 +1,20 @@
+BUILD_MOD = mod
+
+SRCS = trace.c
+
+OBJS = trace.lo
+
+LIBBASE = trace
+
+LDAP_INCDIR= ../../../include       
+LDAP_LIBDIR= ../../../libraries
+
+MOD_DEFS = -DSLAPD_IMPORT -DSLAPD_OVER_TRACE=SLAPD_MOD_DYNAMIC
+#MOD_LIBS = 
+
+shared_LDAP_LIBS = $(LDAP_LIBLDAP_R_LA) $(LDAP_LIBLBER_LA)
+NT_LINK_LIBS = -L.. -lslapd $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS)
+UNIX_LINK_LIBS = $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS)
+
+XINCPATH = -I. -I$(srcdir)/. -I../../../servers/slapd
+XDEFS = $(MODULES_CPPFLAGS)