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

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)

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;

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;

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;

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

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'

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"
 
 /*

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)

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"

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 {

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;

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

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

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;

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 {
 

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"
 

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;

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"
 
 /*

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"
 

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 {