build: avoid util.h as a public header name due to conflict with MacOS

21 files changed, 21 insertions, 21 deletions

diff --git a/lib/async_req/async_sock.c b/lib/async_req/async_sock.c
index 3c68a1c4de..545d21378f 100644
--- a/lib/async_req/async_sock.c
+++ b/lib/async_req/async_sock.c
@@ -30,7 +30,7 @@
 
 /* Note: lib/util/ is currently GPL */
 #include "lib/util/tevent_unix.h"
-#include "lib/util/util.h"
+#include "lib/util/samba_util.h"
 
 #ifndef TALLOC_FREE
 #define TALLOC_FREE(ctx) do { talloc_free(ctx); ctx=NULL; } while(0)
diff --git a/lib/crypto/hmacmd5test.c b/lib/crypto/hmacmd5test.c
index a6621a6e13..a951409cad 100644
--- a/lib/crypto/hmacmd5test.c
+++ b/lib/crypto/hmacmd5test.c
@@ -17,7 +17,7 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "replace.h"
-#include "../lib/util/util.h"
+#include "../lib/util/samba_util.h"
 #include "../lib/crypto/crypto.h"
 
 struct torture_context;
diff --git a/lib/crypto/md4test.c b/lib/crypto/md4test.c
index 7516e826ab..4ee05c1f8b 100644
--- a/lib/crypto/md4test.c
+++ b/lib/crypto/md4test.c
@@ -18,7 +18,7 @@
 */
 
 #include "replace.h"
-#include "../lib/util/util.h"
+#include "../lib/util/samba_util.h"
 #include "../lib/crypto/crypto.h"
 
 struct torture_context;
diff --git a/lib/crypto/md5test.c b/lib/crypto/md5test.c
index 0457d4d4ea..38e65317ff 100644
--- a/lib/crypto/md5test.c
+++ b/lib/crypto/md5test.c
@@ -18,7 +18,7 @@
 */
 
 #include "replace.h"
-#include "../lib/util/util.h"
+#include "../lib/util/samba_util.h"
 #include "../lib/crypto/crypto.h"
 
 struct torture_context;
diff --git a/lib/util/rfc1738.c b/lib/util/rfc1738.c
index b45310a34b..c8f0472541 100644
--- a/lib/util/rfc1738.c
+++ b/lib/util/rfc1738.c
@@ -50,7 +50,7 @@
 
 #include "includes.h"
 
-#include "util.h"
+#include "lib/util/samba_util.h"
 
 /*
  *  RFC 1738 defines that these characters should be escaped, as well
diff --git a/lib/util/util.h b/lib/util/samba_util.h
index 9a76fa9f04..9a76fa9f04 100644
--- a/lib/util/util.h
+++ b/lib/util/samba_util.h
diff --git a/lib/util/wscript_build b/lib/util/wscript_build
index 553748a22e..70a639d2d7 100755
--- a/lib/util/wscript_build
+++ b/lib/util/wscript_build
@@ -10,8 +10,8 @@ bld.SAMBA_LIBRARY('samba-util',
                     server_id.c dprintf.c parmlist.c bitmap.c''',
                   deps='DYNCONFIG',
                   public_deps='talloc execinfo uid_wrapper pthread LIBCRYPTO charset',
-                  public_headers='debug.h attr.h byteorder.h data_blob.h memory.h safe_string.h time.h talloc_stack.h xfile.h dlinklist.h util.h string_wrappers.h',
-                  header_path= [ ('dlinklist.h util.h', '.'), ('*', 'util') ],
+                  public_headers='debug.h attr.h byteorder.h data_blob.h memory.h safe_string.h time.h talloc_stack.h xfile.h dlinklist.h samba_util.h string_wrappers.h',
+                  header_path= [ ('dlinklist.h samba_util.h', '.'), ('*', 'util') ],
                   local_include=False,
                   vnum='0.0.1',
                   pc_files='samba-util.pc'
diff --git a/librpc/ndr/libndr.h b/librpc/ndr/libndr.h
index c8edfdac39..80b0ec9182 100644
--- a/librpc/ndr/libndr.h
+++ b/librpc/ndr/libndr.h
@@ -27,7 +27,7 @@
 
 #include <talloc.h>
 #include <sys/time.h>
-#include "../lib/util/util.h" /* for discard_const */
+#include "../lib/util/samba_util.h" /* for discard_const */
 #include "../lib/util/charset/charset.h"
 
 /*
diff --git a/nsswitch/libwbclient/tests/wbclient.c b/nsswitch/libwbclient/tests/wbclient.c
index 12fc31ea5e..2e1d653e86 100644
--- a/nsswitch/libwbclient/tests/wbclient.c
+++ b/nsswitch/libwbclient/tests/wbclient.c
@@ -29,7 +29,7 @@
 #include "lib/util/charset/charset.h"
 #include "libcli/auth/libcli_auth.h"
 #include "source4/param/param.h"
-#include "lib/util/util.h"
+#include "lib/util/samba_util.h"
 #include "lib/crypto/arcfour.h"
 
 #define WBC_ERROR_EQUAL(x,y) (x == y)
diff --git a/source3/include/includes.h b/source3/include/includes.h
index ac29b7d901..b644089712 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -498,7 +498,7 @@ typedef char fstring[FSTRING_LEN];
 #endif
 
 /* Lists, trees, caching, database... */
-#include "../lib/util/util.h"
+#include "../lib/util/samba_util.h"
 #include "../lib/util/util_net.h"
 #include "../lib/util/xfile.h"
 #include "../lib/util/memory.h"
diff --git a/source3/lib/server_prefork.c b/source3/lib/server_prefork.c
index a241e24798..89600aaa2a 100644
--- a/source3/lib/server_prefork.c
+++ b/source3/lib/server_prefork.c
@@ -25,7 +25,7 @@
 #include "system/shmem.h"
 #include "system/filesys.h"
 #include "server_prefork.h"
-#include "../lib/util/util.h"
+#include "../lib/util/samba_util.h"
 #include "../lib/util/tevent_unix.h"
 
 struct prefork_pool {
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 <ldb_errors.h>
 #include <ldb_module.h>
 #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 <http://www.gnu.org/licenses/>.
  */
 #include "includes.h"
-#include "lib/util/util.h"
+#include "lib/util/samba_util.h"
 #include "lib/policy/policy.h"
 
 struct gp_parse_context {