lib: Remove global xfile.h includes

This makes it more obvious where this legacy code is used

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Autobuild-User(master): Jeremy Allison <jra@samba.org>
Autobuild-Date(master): Sun Nov 20 06:23:19 CET 2016 on sn-devel-144

diff --git a/lib/util/samba_util.h b/lib/util/samba_util.h
index 2f8de9e7890edb3dcfbec0b6adfd78594ea30229..7863555e90892032bfd3f92d0a2261dbf9e7de65 100644 (file)
--- a/lib/util/samba_util.h
+++ b/lib/util/samba_util.h
@@ -46,7 +46,6 @@ extern const char *panic_action;
 
 #include "lib/util/time.h"
 #include "lib/util/data_blob.h"
-#include "lib/util/xfile.h"
 #include "lib/util/byteorder.h"
 #include "lib/util/talloc_stack.h"
 

diff --git a/libcli/smbreadline/smbreadline.c b/libcli/smbreadline/smbreadline.c
index c58555400ca90095daf3806f3ad60428966577be..8be6e4855f7b3b6136210258cc8186733fa893b0 100644 (file)
--- a/libcli/smbreadline/smbreadline.c
+++ b/libcli/smbreadline/smbreadline.c
@@ -24,6 +24,7 @@
 #include "system/select.h"
 #include "system/readline.h"
 #include "libcli/smbreadline/smbreadline.h"
+#include "lib/util/xfile.h"
 
 #undef malloc
 

diff --git a/source3/auth/user_util.c b/source3/auth/user_util.c
index 79b193e686d020bf06ce0119e6fc17456d2f1af1..f3cf499f58388cdc35bb7e118e3804c81da09b0a 100644 (file)
--- a/source3/auth/user_util.c
+++ b/source3/auth/user_util.c
@@ -22,6 +22,7 @@
 #include "includes.h"
 #include "system/filesys.h"
 #include "auth.h"
+#include "lib/util/xfile.h"
 
 /*******************************************************************
  Map a username from a dos name to a unix name by looking in the username

diff --git a/source3/client/client.c b/source3/client/client.c
index ded797120b8942174539c9caec9bee4735594736..65696f9704a29cebf2aad11e4a60bd612f7726f5 100644 (file)
--- a/source3/client/client.c
+++ b/source3/client/client.c
@@ -39,6 +39,7 @@
 #include "libsmb/nmblib.h"
 #include "include/ntioctl.h"
 #include "../libcli/smb/smbXcli_base.h"
+#include "lib/util/xfile.h"
 
 #ifndef REGISTER
 #define REGISTER 0

diff --git a/source3/include/includes.h b/source3/include/includes.h
index 234a5644ab4532807f6790a965a659925357d40e..a436427a1286752be4346a6964351eaf6695ef0d 100644 (file)
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -303,7 +303,6 @@ typedef char fstring[FSTRING_LEN];
 /* Lists, trees, caching, database... */
 #include "../lib/util/samba_util.h"
 #include "../lib/util/util_net.h"
-#include "../lib/util/xfile.h"
 #include "../lib/util/memory.h"
 #include "../lib/util/attr.h"
 #include "../lib/util/tsort.h"

diff --git a/source3/lib/popt_common.c b/source3/lib/popt_common.c
index 6c1515bfcfc7e6cbf013f1b742e4e003a15e24c0..f74543fa5ac050e49651cec9ee90cf52f39308a4 100644 (file)
--- a/source3/lib/popt_common.c
+++ b/source3/lib/popt_common.c
@@ -24,6 +24,7 @@
 #include "system/filesys.h"
 #include "popt_common.h"
 #include "lib/param/param.h"
+#include "lib/util/xfile.h"
 
 /* Handle command line options:
  *             -d,--debuglevel 

diff --git a/source3/modules/vfs_expand_msdfs.c b/source3/modules/vfs_expand_msdfs.c
index eaf96e0ae09986aaa1239993afd4495f9f221099..40c57c2d1079796acb7a5a6fb6318100310a489f 100644 (file)
--- a/source3/modules/vfs_expand_msdfs.c
+++ b/source3/modules/vfs_expand_msdfs.c
@@ -24,6 +24,7 @@
 #include "smbd/globals.h"
 #include "auth.h"
 #include "../lib/tsocket/tsocket.h"
+#include "lib/util/xfile.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_VFS

diff --git a/source3/nmbd/nmbd.h b/source3/nmbd/nmbd.h
index 47940e19401e934bc312394286c165d85b6f8060..f2086a5163977fc4ab6f8fe190ca280508a7661d 100644 (file)
--- a/source3/nmbd/nmbd.h
+++ b/source3/nmbd/nmbd.h
@@ -25,6 +25,7 @@
 #define SYNC_DNS 1
 #endif
 
+#include "lib/util/xfile.h"
 #include "libsmb/nmblib.h"
 #include "nmbd/nmbd_proto.h"
 

diff --git a/source3/printing/print_aix.c b/source3/printing/print_aix.c
index da47be05bed69527145531e13f7dbfd51671fd32..7b5a1e3881c58aed07da18637e58748125ba12db 100644 (file)
--- a/source3/printing/print_aix.c
+++ b/source3/printing/print_aix.c
@@ -27,6 +27,7 @@
 #include "includes.h"
 #include "system/filesys.h"
 #include "printing/pcap.h"
+#include "lib/util/xfile.h"
 
 #ifdef AIX
 bool aix_cache_reload(struct pcap_cache **_pcache)

diff --git a/source3/printing/print_standard.c b/source3/printing/print_standard.c
index 080ef077207d4d9dc62e1a500cb8ec9d2420b700..4404aeb681d18fc5f39a82607d80ee9eca06d0a3 100644 (file)
--- a/source3/printing/print_standard.c
+++ b/source3/printing/print_standard.c
@@ -57,6 +57,7 @@
 #include "includes.h"
 #include "system/filesys.h"
 #include "printing/pcap.h"
+#include "lib/util/xfile.h"
 
 /* handle standard printcap - moved from pcap_printer_fn() */
 bool std_pcap_cache_reload(const char *pcap_name, struct pcap_cache **_pcache)

diff --git a/source3/rpc_server/svcctl/srv_svcctl_reg.c b/source3/rpc_server/svcctl/srv_svcctl_reg.c
index 0952e257f19a462945980d323e9ae1d7e5e2cebf..9b1af800b9dbfe23dfdd0ada0440902a3901d53a 100644 (file)
--- a/source3/rpc_server/svcctl/srv_svcctl_reg.c
+++ b/source3/rpc_server/svcctl/srv_svcctl_reg.c
@@ -31,6 +31,7 @@
 #include "rpc_server/svcctl/srv_svcctl_reg.h"
 #include "auth.h"
 #include "registry/reg_backend_db.h"
+#include "lib/util/xfile.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_REGISTRY

diff --git a/source3/utils/ntlm_auth.c b/source3/utils/ntlm_auth.c
index a5c1844cecdc0ce593f6471a58ad7c24f6a8407e..4f67b90324675d44025988c392b6944cd8c13cc9 100644 (file)
--- a/source3/utils/ntlm_auth.c
+++ b/source3/utils/ntlm_auth.c
@@ -47,6 +47,7 @@
 #include "nsswitch/libwbclient/wbclient.h"
 #include "lib/param/loadparm.h"
 #include "lib/util/base64.h"
+#include "lib/util/xfile.h"
 
 #if HAVE_KRB5
 #include "auth/kerberos/pac_utils.h"

diff --git a/source3/winbindd/idmap_hash/mapfile.c b/source3/winbindd/idmap_hash/mapfile.c
index a0e2b489cbb0e1f76a6caaa60adeb1a63f112e45..41554a157203b5813bfbe16af5be07747d9ab94e 100644 (file)
--- a/source3/winbindd/idmap_hash/mapfile.c
+++ b/source3/winbindd/idmap_hash/mapfile.c
@@ -24,6 +24,7 @@
 #include "idmap.h"
 #include "idmap_hash.h"
 #include <stdio.h>
+#include "lib/util/xfile.h"
 
 XFILE *lw_map_file = NULL;
 

diff --git a/source4/include/includes.h b/source4/include/includes.h
index 5aabb8e670e945dc209fc72893700e1ab0941b06..39b0494342043e7f59f0767de2d73ce01b4fcce0 100644 (file)
--- a/source4/include/includes.h
+++ b/source4/include/includes.h
@@ -55,7 +55,6 @@
 #ifndef _PRINTF_ATTRIBUTE
 #define _PRINTF_ATTRIBUTE(a1, a2) PRINTF_ATTRIBUTE(a1, a2)
 #endif
-#include "../lib/util/xfile.h"
 #include "../lib/util/attr.h"
 
 /* debug.h need to be included before samba_util.h for the macro SMB_ASSERT */

diff --git a/source4/utils/ntlm_auth.c b/source4/utils/ntlm_auth.c
index 75dcebf05714bfaea50096f428a089ead5ee8164..a4a1c8be607ff7d56d3d7719ab8a1996cfeb9dd0 100644 (file)
--- a/source4/utils/ntlm_auth.c
+++ b/source4/utils/ntlm_auth.c
@@ -39,6 +39,7 @@
 #include "auth/ntlmssp/ntlmssp.h"
 #include "param/param.h"
 #include "lib/util/base64.h"
+#include "lib/util/xfile.h"
 
 #define INITIAL_BUFFER_SIZE 300
 #define MAX_BUFFER_SIZE 63000