From d40fe50a6755ab701f2fe8a434f1d3331769a4c0 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Tue, 20 Sep 2011 14:26:36 -0700 Subject: build: avoid util.h as a public header name due to conflict with MacOS --- source4/dsdb/samdb/ldb_modules/descriptor.c | 2 +- source4/dsdb/samdb/ldb_modules/dirsync.c | 2 +- source4/dsdb/samdb/ldb_modules/extended_dn_in.c | 2 +- source4/dsdb/samdb/ldb_modules/extended_dn_out.c | 2 +- source4/dsdb/samdb/ldb_modules/objectclass.c | 2 +- source4/dsdb/samdb/ldb_modules/schema.c | 2 +- source4/dsdb/samdb/ldb_modules/update_keytab.c | 2 +- source4/dsdb/samdb/ldb_modules/util.c | 2 +- source4/include/includes.h | 2 +- source4/lib/policy/gp_ini.c | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) (limited to 'source4') diff --git a/source4/dsdb/samdb/ldb_modules/descriptor.c b/source4/dsdb/samdb/ldb_modules/descriptor.c index 4bcb878785..9763c8ee49 100644 --- a/source4/dsdb/samdb/ldb_modules/descriptor.c +++ b/source4/dsdb/samdb/ldb_modules/descriptor.c @@ -42,7 +42,7 @@ #include "dsdb/samdb/ldb_modules/schema.h" #include "auth/auth.h" #include "param/param.h" -#include "util.h" +#include "dsdb/samdb/ldb_modules/util.h" struct descriptor_data { int _dummy; diff --git a/source4/dsdb/samdb/ldb_modules/dirsync.c b/source4/dsdb/samdb/ldb_modules/dirsync.c index 676aaff21a..3f22f15beb 100644 --- a/source4/dsdb/samdb/ldb_modules/dirsync.c +++ b/source4/dsdb/samdb/ldb_modules/dirsync.c @@ -27,7 +27,7 @@ #include "librpc/gen_ndr/ndr_drsblobs.h" #include "librpc/ndr/libndr.h" #include "dsdb/samdb/samdb.h" -#include "util.h" +#include "dsdb/samdb/ldb_modules/util.h" #define LDAP_DIRSYNC_OBJECT_SECURITY 0x01 #define LDAP_DIRSYNC_ANCESTORS_FIRST_ORDER 0x800 diff --git a/source4/dsdb/samdb/ldb_modules/extended_dn_in.c b/source4/dsdb/samdb/ldb_modules/extended_dn_in.c index 998634f334..541a2593f1 100644 --- a/source4/dsdb/samdb/ldb_modules/extended_dn_in.c +++ b/source4/dsdb/samdb/ldb_modules/extended_dn_in.c @@ -34,7 +34,7 @@ #include #include #include "dsdb/samdb/samdb.h" -#include "util.h" +#include "dsdb/samdb/ldb_modules/util.h" /* TODO: if relax is not set then we need to reject the fancy RMD_* and diff --git a/source4/dsdb/samdb/ldb_modules/extended_dn_out.c b/source4/dsdb/samdb/ldb_modules/extended_dn_out.c index 0f37bbebd4..9e1bec98a5 100644 --- a/source4/dsdb/samdb/ldb_modules/extended_dn_out.c +++ b/source4/dsdb/samdb/ldb_modules/extended_dn_out.c @@ -40,7 +40,7 @@ #include "librpc/gen_ndr/ndr_security.h" #include "librpc/ndr/libndr.h" #include "dsdb/samdb/samdb.h" -#include "util.h" +#include "dsdb/samdb/ldb_modules/util.h" struct extended_dn_out_private { bool dereference; diff --git a/source4/dsdb/samdb/ldb_modules/objectclass.c b/source4/dsdb/samdb/ldb_modules/objectclass.c index ab1766f856..16a5984c90 100644 --- a/source4/dsdb/samdb/ldb_modules/objectclass.c +++ b/source4/dsdb/samdb/ldb_modules/objectclass.c @@ -46,7 +46,7 @@ #include "param/param.h" #include "../libds/common/flags.h" #include "dsdb/samdb/ldb_modules/schema.h" -#include "util.h" +#include "dsdb/samdb/ldb_modules/util.h" struct oc_context { diff --git a/source4/dsdb/samdb/ldb_modules/schema.c b/source4/dsdb/samdb/ldb_modules/schema.c index eebe1612ea..51c6a658d6 100644 --- a/source4/dsdb/samdb/ldb_modules/schema.c +++ b/source4/dsdb/samdb/ldb_modules/schema.c @@ -25,7 +25,7 @@ #include "librpc/ndr/libndr.h" #include "dsdb/samdb/ldb_modules/util.h" #include "dsdb/samdb/samdb.h" -#include "util.h" +#include "dsdb/common/util.h" #include "libcli/security/security.h" #include "dsdb/samdb/ldb_modules/schema.h" diff --git a/source4/dsdb/samdb/ldb_modules/update_keytab.c b/source4/dsdb/samdb/ldb_modules/update_keytab.c index 81d672b5ec..2d4a903aeb 100644 --- a/source4/dsdb/samdb/ldb_modules/update_keytab.c +++ b/source4/dsdb/samdb/ldb_modules/update_keytab.c @@ -34,7 +34,7 @@ #include "auth/credentials/credentials_krb5.h" #include "system/kerberos.h" #include "auth/kerberos/kerberos.h" -#include "util.h" +#include "dsdb/samdb/ldb_modules/util.h" struct dn_list { struct ldb_message *msg; diff --git a/source4/dsdb/samdb/ldb_modules/util.c b/source4/dsdb/samdb/ldb_modules/util.c index 48600e718b..7f601afa33 100644 --- a/source4/dsdb/samdb/ldb_modules/util.c +++ b/source4/dsdb/samdb/ldb_modules/util.c @@ -26,7 +26,7 @@ #include "librpc/ndr/libndr.h" #include "dsdb/samdb/ldb_modules/util.h" #include "dsdb/samdb/samdb.h" -#include "util.h" +#include "dsdb/common/util.h" #include "libcli/security/security.h" /* diff --git a/source4/include/includes.h b/source4/include/includes.h index d0a97020c6..e60bf9035d 100644 --- a/source4/include/includes.h +++ b/source4/include/includes.h @@ -58,7 +58,7 @@ #include "../lib/util/xfile.h" #include "../lib/util/attr.h" #include "../lib/util/debug.h" -#include "../lib/util/util.h" +#include "../lib/util/samba_util.h" #include "libcli/util/error.h" diff --git a/source4/lib/policy/gp_ini.c b/source4/lib/policy/gp_ini.c index d16011c722..da2f5f43d5 100644 --- a/source4/lib/policy/gp_ini.c +++ b/source4/lib/policy/gp_ini.c @@ -18,7 +18,7 @@ * along with this program; if not, see . */ #include "includes.h" -#include "lib/util/util.h" +#include "lib/util/samba_util.h" #include "lib/policy/policy.h" struct gp_parse_context { -- cgit