ITS#7790 - Fix contrib modules for new header name

diff --git a/contrib/slapd-modules/adremap/adremap.c b/contrib/slapd-modules/adremap/adremap.c
index 3e6b5ead22e5cc94b713eda3e689540c17d5be9d..5a7b8f1be7217f27388b8f5a98719a44b10be13a 100644 (file)
--- a/contrib/slapd-modules/adremap/adremap.c
+++ b/contrib/slapd-modules/adremap/adremap.c
@@ -32,7 +32,7 @@
 #include <ac/time.h>
 #include <ac/string.h>
 #include <ac/ctype.h>
-#include "config.h"
+#include "slap-config.h"
 
 typedef struct adremap_dnv {
        struct adremap_dnv *ad_next;

diff --git a/contrib/slapd-modules/allop/allop.c b/contrib/slapd-modules/allop/allop.c
index a4c03dbaa364bbd5d35d91aece6d008614d76ddf..da046699dcbbee1e8295441fcbf798c9fa65d21f 100644 (file)
--- a/contrib/slapd-modules/allop/allop.c
+++ b/contrib/slapd-modules/allop/allop.c
@@ -39,7 +39,7 @@ allop-URI     <ldapURI>
 #include <ac/string.h>
 
 #include "slap.h"
-#include "config.h"
+#include "slap-config.h"
 
 #define        SLAP_OVER_VERSION_REQUIRE(major,minor,patch) \
        ( \

diff --git a/contrib/slapd-modules/authzid/authzid.c b/contrib/slapd-modules/authzid/authzid.c
index 6228b5221dcb7d23f74940cf08ce7d67162fee8c..631bb84e522f1c91596dc4eadc3c6c7320e2e23f 100644 (file)
--- a/contrib/slapd-modules/authzid/authzid.c
+++ b/contrib/slapd-modules/authzid/authzid.c
@@ -27,7 +27,7 @@
 #include "portable.h"
 
 #include "slap.h"
-#include "config.h"
+#include "slap-config.h"
 #include "lutil.h"
 #include "ac/string.h"
 

diff --git a/contrib/slapd-modules/autogroup/autogroup.c b/contrib/slapd-modules/autogroup/autogroup.c
index bb8900cd219805f23035a7b75d75c497babecf6a..90b88f9ccd83291c123b064061bfde6ed7feafe4 100644 (file)
--- a/contrib/slapd-modules/autogroup/autogroup.c
+++ b/contrib/slapd-modules/autogroup/autogroup.c
@@ -31,7 +31,7 @@
 #include <ac/string.h>
 
 #include "slap.h"
-#include "config.h"
+#include "slap-config.h"
 #include "lutil.h"
 
 #ifndef SLAPD_MEMBEROF_ATTR

diff --git a/contrib/slapd-modules/cloak/cloak.c b/contrib/slapd-modules/cloak/cloak.c
index 8abede8ddfa71dc6d16e4b088e3e79b5e6ea13ef..b10d389faf661a523212f0d8e2f84679870c42a6 100644 (file)
--- a/contrib/slapd-modules/cloak/cloak.c
+++ b/contrib/slapd-modules/cloak/cloak.c
@@ -30,7 +30,7 @@
 
 #include "lutil.h"
 #include "slap.h"
-#include "config.h"
+#include "slap-config.h"
 
 enum { CLOAK_ATTR = 1 };
 

diff --git a/contrib/slapd-modules/lastbind/lastbind.c b/contrib/slapd-modules/lastbind/lastbind.c
index 2661c3ee02b87f53d75cf49a03e4c4cd6c42da54..9c2650d4a31c43a7d05ad22ce425ecadd530474d 100644 (file)
--- a/contrib/slapd-modules/lastbind/lastbind.c
+++ b/contrib/slapd-modules/lastbind/lastbind.c
@@ -36,7 +36,7 @@
 #include <ac/time.h>
 #include <ac/string.h>
 #include <ac/ctype.h>
-#include "config.h"
+#include "slap-config.h"
 
 /* Per-instance configuration information */
 typedef struct lastbind_info {

diff --git a/contrib/slapd-modules/nops/nops.c b/contrib/slapd-modules/nops/nops.c
index 9e7f60e857b2335cbe90481a80c12d4dcc2dbbee..1b746440ab01c926445267f6f5e18bac2021ec87 100644 (file)
--- a/contrib/slapd-modules/nops/nops.c
+++ b/contrib/slapd-modules/nops/nops.c
@@ -29,7 +29,7 @@
 
 #include "lutil.h"
 #include "slap.h"
-#include "config.h"
+#include "slap-config.h"
 
 static ConfigDriver nops_cf_gen;
 

diff --git a/contrib/slapd-modules/nssov/nssov.c b/contrib/slapd-modules/nssov/nssov.c
index c0fd186c755b5f28602c694e0758e571ea7540ce..06531462b5483791f03e6d5fbb42f5901119db1d 100644 (file)
--- a/contrib/slapd-modules/nssov/nssov.c
+++ b/contrib/slapd-modules/nssov/nssov.c
@@ -27,7 +27,7 @@
 #define SLAPD_OVER_NSSOV SLAPD_MOD_DYNAMIC
 #endif
 
-#include "../slapd/config.h"   /* not nss-ldapd config.h */
+#include "slap-config.h"
 
 #include "lutil.h"
 

diff --git a/contrib/slapd-modules/passwd/totp/slapd-totp.c b/contrib/slapd-modules/passwd/totp/slapd-totp.c
index a45bfb10ee77b6c33adab9c409a920dde2b92557..db9596935593ef83700f622f9ff0701baff0f5d7 100644 (file)
--- a/contrib/slapd-modules/passwd/totp/slapd-totp.c
+++ b/contrib/slapd-modules/passwd/totp/slapd-totp.c
@@ -92,7 +92,7 @@ static void HMAC_CTX_free(HMAC_CTX *ctx)
 #endif
 
 #include "slap.h"
-#include "config.h"
+#include "slap-config.h"
 
 static LUTIL_PASSWD_CHK_FUNC chk_totp1, chk_totp256, chk_totp512,
        chk_totp1andpw, chk_totp256andpw, chk_totp512andpw;

diff --git a/contrib/slapd-modules/samba4/pguid.c b/contrib/slapd-modules/samba4/pguid.c
index 04c104b1cbd3f0154d03c8bdba5bae19d62b8175..a002b48ef8c12210369c3e556469d151e45405b6 100644 (file)
--- a/contrib/slapd-modules/samba4/pguid.c
+++ b/contrib/slapd-modules/samba4/pguid.c
@@ -29,7 +29,7 @@
 #include "ac/socket.h"
 
 #include "slap.h"
-#include "config.h"
+#include "slap-config.h"
 
 #include "lutil.h"
 

diff --git a/contrib/slapd-modules/samba4/rdnval.c b/contrib/slapd-modules/samba4/rdnval.c
index 22f0740628a7794fe2fa4ba21dc6685ad446cede..49a35933d509c92c22c79c8b8e7cf0c1e13bb855 100644 (file)
--- a/contrib/slapd-modules/samba4/rdnval.c
+++ b/contrib/slapd-modules/samba4/rdnval.c
@@ -29,7 +29,7 @@
 #include "ac/socket.h"
 
 #include "slap.h"
-#include "config.h"
+#include "slap-config.h"
 
 #include "lutil.h"
 

diff --git a/contrib/slapd-modules/samba4/vernum.c b/contrib/slapd-modules/samba4/vernum.c
index de9931becea253ed7a1f0cef2467849baf7542af..3c51b80137021dabb30befd8fc821ed509e568af 100644 (file)
--- a/contrib/slapd-modules/samba4/vernum.c
+++ b/contrib/slapd-modules/samba4/vernum.c
@@ -29,7 +29,7 @@
 #include "ac/socket.h"
 
 #include "slap.h"
-#include "config.h"
+#include "slap-config.h"
 
 #include "lutil.h"
 

diff --git a/contrib/slapd-modules/smbk5pwd/smbk5pwd.c b/contrib/slapd-modules/smbk5pwd/smbk5pwd.c
index c809aeef150266ee0142c71000721266c40727f8..de5745b59886510bf091992acc4ba1d151a5ea4d 100644 (file)
--- a/contrib/slapd-modules/smbk5pwd/smbk5pwd.c
+++ b/contrib/slapd-modules/smbk5pwd/smbk5pwd.c
@@ -32,7 +32,7 @@
 #include <ac/errno.h>
 #include <ac/string.h>
 
-#include "config.h"
+#include "slap-config.h"
 
 #ifdef DO_KRB5
 #include <lber.h>

diff --git a/contrib/slapd-modules/usn/usn.c b/contrib/slapd-modules/usn/usn.c
index 54dd9809df0a3c0e299a5764f6d9d5180bfd9c67..d382d997b053a7aadadd7cfbc06c73c700c18a69 100644 (file)
--- a/contrib/slapd-modules/usn/usn.c
+++ b/contrib/slapd-modules/usn/usn.c
@@ -28,7 +28,7 @@
 #include <ac/socket.h>
 
 #include "slap.h"
-#include "config.h"
+#include "slap-config.h"
 
 /* This overlay intercepts write operations and adds a Microsoft-style
  * USN to the target entry.