From 11e5ba23d5718808fc9a6dbc4150d27ff1cf1bb9 Mon Sep 17 00:00:00 2001 From: Quanah Gibson-Mount Date: Mon, 8 Feb 2021 19:53:10 +0000 Subject: [PATCH] ITS#7790 - Fix contrib modules for new header name --- contrib/slapd-modules/adremap/adremap.c | 2 +- contrib/slapd-modules/allop/allop.c | 2 +- contrib/slapd-modules/authzid/authzid.c | 2 +- contrib/slapd-modules/autogroup/autogroup.c | 2 +- contrib/slapd-modules/cloak/cloak.c | 2 +- contrib/slapd-modules/lastbind/lastbind.c | 2 +- contrib/slapd-modules/nops/nops.c | 2 +- contrib/slapd-modules/nssov/nssov.c | 2 +- contrib/slapd-modules/passwd/totp/slapd-totp.c | 2 +- contrib/slapd-modules/samba4/pguid.c | 2 +- contrib/slapd-modules/samba4/rdnval.c | 2 +- contrib/slapd-modules/samba4/vernum.c | 2 +- contrib/slapd-modules/smbk5pwd/smbk5pwd.c | 2 +- contrib/slapd-modules/usn/usn.c | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/contrib/slapd-modules/adremap/adremap.c b/contrib/slapd-modules/adremap/adremap.c index 3e6b5ead22..5a7b8f1be7 100644 --- a/contrib/slapd-modules/adremap/adremap.c +++ b/contrib/slapd-modules/adremap/adremap.c @@ -32,7 +32,7 @@ #include #include #include -#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 a4c03dbaa3..da046699dc 100644 --- a/contrib/slapd-modules/allop/allop.c +++ b/contrib/slapd-modules/allop/allop.c @@ -39,7 +39,7 @@ allop-URI #include #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 6228b5221d..631bb84e52 100644 --- 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 bb8900cd21..90b88f9ccd 100644 --- a/contrib/slapd-modules/autogroup/autogroup.c +++ b/contrib/slapd-modules/autogroup/autogroup.c @@ -31,7 +31,7 @@ #include #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 8abede8ddf..b10d389faf 100644 --- 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 2661c3ee02..9c2650d4a3 100644 --- a/contrib/slapd-modules/lastbind/lastbind.c +++ b/contrib/slapd-modules/lastbind/lastbind.c @@ -36,7 +36,7 @@ #include #include #include -#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 9e7f60e857..1b746440ab 100644 --- 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 c0fd186c75..06531462b5 100644 --- 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 a45bfb10ee..db95969355 100644 --- 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 04c104b1cb..a002b48ef8 100644 --- 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 22f0740628..49a35933d5 100644 --- 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 de9931bece..3c51b80137 100644 --- 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 c809aeef15..de5745b598 100644 --- a/contrib/slapd-modules/smbk5pwd/smbk5pwd.c +++ b/contrib/slapd-modules/smbk5pwd/smbk5pwd.c @@ -32,7 +32,7 @@ #include #include -#include "config.h" +#include "slap-config.h" #ifdef DO_KRB5 #include diff --git a/contrib/slapd-modules/usn/usn.c b/contrib/slapd-modules/usn/usn.c index 54dd9809df..d382d997b0 100644 --- a/contrib/slapd-modules/usn/usn.c +++ b/contrib/slapd-modules/usn/usn.c @@ -28,7 +28,7 @@ #include #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. -- 2.47.3