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

diff --git a/lib/async_req/async_sock.c b/lib/async_req/async_sock.c
index 3c68a1c4dee4d0120c6c358d8711c6db0cd2e1df..545d21378fa1b7a082763231ec639b8ba41d200b 100644 (file)
--- 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 a6621a6e135853b5aadb10e1fe92b3861cd8698f..a951409cadb2a9b6473293cdb5dc7e4e06ae6f40 100644 (file)
--- 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 7516e826abf27adc494ca69a2f091ffa01377bb1..4ee05c1f8b0cca9706ba0786111e358e534285b7 100644 (file)
--- 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 0457d4d4ea4b18e947cd6db75760ba6a76e4049e..38e65317ff8625e3dfbc2845384f1ee68f12c1e4 100644 (file)
--- 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 b45310a34b774782324d3187534d837305301528..c8f0472541448f6ffafaff2061ca5375dc0f5e9b 100644 (file)
--- 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
similarity index 100%
rename from lib/util/util.h
rename to lib/util/samba_util.h

diff --git a/lib/util/wscript_build b/lib/util/wscript_build
index 553748a22ec8a19bdf03166fe234a2bac5acd89c..70a639d2d7cbc0e8ef8ff90baab1fe8b7996d3ab 100755 (executable)
--- 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 c8edfdac39374aebbf94bd18996eac1d3aa967f0..80b0ec9182dedebc39b012a3ca9133034edd94b0 100644 (file)
--- 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 12fc31ea5e30aeb426465ba58ce4f51401d51558..2e1d653e86fe313775f8a8ebb0b44b6a9140da85 100644 (file)
--- 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 ac29b7d90150de482fa8530da0a17c5df603078e..b644089712725b5407890037a7a893bda47c0aca 100644 (file)
--- 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 a241e24798e6bb8beaab2e34684486781523f698..89600aaa2ac5ff47e1f070d6a285967263247193 100644 (file)
--- 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 4bcb87878552ce1222713a6c510755f475af03ba..9763c8ee493afc73cf99a0c65578f51154405918 100644 (file)
--- 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 676aaff21abbfccfb664345d23f99e1072680f5a..3f22f15bebf2536b7f7c9f3ae204fd222d647315 100644 (file)
--- 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 998634f334ad0fb6244349f67d6c4a1cf6d0e070..541a2593f176c367952ccba62a9f05a32c1a6443 100644 (file)
--- 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 0f37bbebd434ad7e1262cf2e576960962296d481..9e1bec98a54e714b191b1bc9eaca26044c2d8d39 100644 (file)
--- 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 ab1766f856e4347bbec5a6bb941e8d23358d21f9..16a5984c90163a5f90f4c282fe7c05e64edcb1bd 100644 (file)
--- 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 eebe1612ea5b13521f56ef524ef409c745b81368..51c6a658d6ede013af2c5097fe893c1138ab8a9e 100644 (file)
--- 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 81d672b5ec3e9610b50cfdfad914a816d7f79191..2d4a903aeb9c9a7c7f8fa216654161cdf97e6c9f 100644 (file)
--- 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 48600e718ba9851cb8f9240fa7b930d27195ade4..7f601afa33a60beb454211d46318e9dadb802e05 100644 (file)
--- 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 d0a97020c6e470de2ebe05bd28b10635ebd621b4..e60bf9035d25cd2e90b1a42e1dbe13efda415d75 100644 (file)
--- 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 d16011c722fb84b41fd53e20e4b43bdddeaea1cc..da2f5f43d54762f99bea292c8a253542044c0d35 100644 (file)
--- 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 {