From c4144e0b83d53fd2ac1d2062ef4b8327739d2e25 Mon Sep 17 00:00:00 2001 From: Alexander Bokovoy Date: Fri, 26 Mar 2021 12:10:43 +0200 Subject: [PATCH] Rename local config.h to dyndb-config.h Signed-off-by: Alexander Bokovoy --- .gitignore | 4 ++-- configure.ac | 2 +- src/acl.c | 2 +- src/acl.h | 2 +- src/bindcfg.c | 2 +- src/empty_zones.c | 2 +- src/fwd.c | 2 +- src/fwd.h | 2 +- src/ldap_convert.c | 2 +- src/ldap_driver.c | 4 ++-- src/ldap_helper.c | 2 +- src/mldap.c | 2 +- src/rbt_helper.c | 2 +- src/settings.c | 2 +- src/syncptr.c | 2 +- src/syncrepl.c | 2 +- src/zone.c | 2 +- 17 files changed, 19 insertions(+), 19 deletions(-) diff --git a/.gitignore b/.gitignore index 5aa85ad..3a804ab 100644 --- a/.gitignore +++ b/.gitignore @@ -12,7 +12,7 @@ Makefile.in /ar-lib /compile /config.guess -/config.h.in +/dyndb-config.h.in /config.sub /configure /depcomp @@ -23,7 +23,7 @@ Makefile.in # configure Makefile -/config.h +/dyndb-config.h /config.log /config.status /libtool diff --git a/configure.ac b/configure.ac index eefbc34..a12bfe8 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ AC_INIT([bind-dyndb-ldap], [11.7], [freeipa-devel@redhat.com]) AM_INIT_AUTOMAKE([-Wall foreign dist-bzip2]) AC_CONFIG_SRCDIR([src/ldap_driver.c]) -AC_CONFIG_HEADERS([config.h]) +AC_CONFIG_HEADERS([dyndb-config.h]) AC_CONFIG_MACRO_DIR([m4]) # Disable static libraries diff --git a/src/acl.c b/src/acl.c index e484403..ba89abc 100644 --- a/src/acl.c +++ b/src/acl.c @@ -2,7 +2,7 @@ * Copyright (C) 2009-2014 bind-dyndb-ldap authors; see COPYING for license */ -#include "config.h" +#include "dyndb-config.h" #include #include diff --git a/src/acl.h b/src/acl.h index ce1210e..ec3a56b 100644 --- a/src/acl.h +++ b/src/acl.h @@ -5,7 +5,7 @@ #ifndef _LD_ACL_H_ #define _LD_ACL_H_ -#include "config.h" +#include "dyndb-config.h" #include "ldap_entry.h" #include "types.h" diff --git a/src/bindcfg.c b/src/bindcfg.c index bb76e99..8751470 100644 --- a/src/bindcfg.c +++ b/src/bindcfg.c @@ -4,7 +4,7 @@ * Utilities for BIND configuration parsers. */ -#include "config.h" +#include "dyndb-config.h" #include #include diff --git a/src/empty_zones.c b/src/empty_zones.c index 542e44a..e3e4545 100644 --- a/src/empty_zones.c +++ b/src/empty_zones.c @@ -8,7 +8,7 @@ #include #include -#include "config.h" +#include "dyndb-config.h" #include "empty_zones.h" #include "util.h" #include "zone_register.h" diff --git a/src/fwd.c b/src/fwd.c index 6f5d217..24f6e53 100644 --- a/src/fwd.c +++ b/src/fwd.c @@ -4,7 +4,7 @@ * DNS forwarding helpers. */ -#include "config.h" +#include "dyndb-config.h" #include diff --git a/src/fwd.h b/src/fwd.h index 9567c83..3a12ddc 100644 --- a/src/fwd.h +++ b/src/fwd.h @@ -5,7 +5,7 @@ #ifndef _LD_FWD_H_ #define _LD_FWD_H_ -#include "config.h" +#include "dyndb-config.h" #include "ldap_entry.h" #include "util.h" diff --git a/src/ldap_convert.c b/src/ldap_convert.c index 338088a..dc6e32b 100644 --- a/src/ldap_convert.c +++ b/src/ldap_convert.c @@ -20,7 +20,7 @@ #include #include -#include "config.h" +#include "dyndb-config.h" #include "str.h" #include "ldap_convert.h" #include "log.h" diff --git a/src/ldap_driver.c b/src/ldap_driver.c index c524b7c..20aa9f0 100644 --- a/src/ldap_driver.c +++ b/src/ldap_driver.c @@ -3,9 +3,9 @@ */ #ifdef HAVE_CONFIG_H -#include +#include "dyndb-config.h" #else -#error "Can't compile without config.h" +#error "Can't compile without dyndb-config.h" #endif #include diff --git a/src/ldap_helper.c b/src/ldap_helper.c index 3b4ae5c..e13bcfc 100644 --- a/src/ldap_helper.c +++ b/src/ldap_helper.c @@ -2,7 +2,7 @@ * Copyright (C) 2009-2015 bind-dyndb-ldap authors; see COPYING for license */ -#include "config.h" +#include "dyndb-config.h" #define HAVE_TLS 1 #define HAVE_THREAD_LOCAL 1 diff --git a/src/mldap.c b/src/mldap.c index 088c7cb..3a76153 100644 --- a/src/mldap.c +++ b/src/mldap.c @@ -27,7 +27,7 @@ #include "metadb.h" #include "mldap.h" #include "util.h" -#include "config.h" +#include "dyndb-config.h" #if LIBDNS_VERSION_MAJOR < 1600 #define dns_name_copynf(src, dst) dns_name_copy((src), (dst), NULL) diff --git a/src/rbt_helper.c b/src/rbt_helper.c index 7b6d7c8..6009553 100644 --- a/src/rbt_helper.c +++ b/src/rbt_helper.c @@ -7,7 +7,7 @@ #include "util.h" #include "rbt_helper.h" -#include "config.h" +#include "dyndb-config.h" #define LDAPDB_RBTITER_MAGIC ISC_MAGIC('L', 'D', 'P', 'I') diff --git a/src/settings.c b/src/settings.c index 53a784b..def60d7 100644 --- a/src/settings.c +++ b/src/settings.c @@ -24,7 +24,7 @@ #include "types.h" #include "ldap_helper.h" #include "zone_register.h" -#include "config.h" +#include "dyndb-config.h" #if LIBDNS_VERSION_MAJOR < 1600 #define cfg_parse_buffer cfg_parse_buffer4 diff --git a/src/syncptr.c b/src/syncptr.c index 6bfa2bd..8824679 100644 --- a/src/syncptr.c +++ b/src/syncptr.c @@ -18,7 +18,7 @@ #include #include -#include "config.h" +#include "dyndb-config.h" #include "util.h" #include "ldap_convert.h" #include "ldap_entry.h" diff --git a/src/syncrepl.c b/src/syncrepl.c index 575d733..b7a7ab8 100644 --- a/src/syncrepl.c +++ b/src/syncrepl.c @@ -11,7 +11,7 @@ #include #include -#include "config.h" +#include "dyndb-config.h" #include "ldap_helper.h" #include "util.h" #include "semaphore.h" diff --git a/src/zone.c b/src/zone.c index 7ce1769..0180ba8 100644 --- a/src/zone.c +++ b/src/zone.c @@ -17,7 +17,7 @@ #include #include "util.h" -#include "config.h" +#include "dyndb-config.h" /** * Write given diff to zone journal. Journal will be created