s3: safe_string: do not include string_wrappers.h

Rather than have safe_string.h #include string_wrappers.h, make users of
string_wrappers.h include it explicitly.

includes.h now no longer includes string_wrappers.h transitively. Still
allow includes.h to #include safe_string.h for now so that as many
modules as possible get the safety checks in it.

Signed-off-by: Matthew DeVore <matvore@google.com>
Reviewed-by: David Mulder <dmulder@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>

diff --git a/libgpo/gpext/gpext.c b/libgpo/gpext/gpext.c
index 73bebf1879fbfd8601c4f64ab5219d738417f068..45c89707720b18599e96e850e0b8243fce8a146d 100644 (file)
--- a/libgpo/gpext/gpext.c
+++ b/libgpo/gpext/gpext.c
@@ -27,6 +27,7 @@
 #include "registry.h"
 #include "registry/reg_api.h"
 #include "lib/util/util_paths.h"
+#include "lib/util/string_wrappers.h"
 
 static struct gp_extension *extensions = NULL;
 

diff --git a/libgpo/gpo_filesync.c b/libgpo/gpo_filesync.c
index 28637619226f3bafc75caa3767bc21025f6bcb95..3cd9470655121353d5f8f3362f1b184dced449ab 100644 (file)
--- a/libgpo/gpo_filesync.c
+++ b/libgpo/gpo_filesync.c
@@ -22,6 +22,7 @@
 #include "libsmb/libsmb.h"
 #include "../libgpo/gpo.h"
 #include "libgpo/gpo_proto.h"
+#include "lib/util/string_wrappers.h"
 
 struct sync_context {
        TALLOC_CTX *mem_ctx;

diff --git a/nsswitch/wbinfo.c b/nsswitch/wbinfo.c
index 39e3878b3960ef414e7df5d081d1c65b23b2d231..6cd795ea72e3455f39f0406b958f5e8ff5017a54 100644 (file)
--- a/nsswitch/wbinfo.c
+++ b/nsswitch/wbinfo.c
@@ -28,6 +28,7 @@
 #include "lib/cmdline/popt_common.h"
 #include "lib/afs/afs_settoken.h"
 #include "lib/util/smb_strtox.h"
+#include "lib/util/string_wrappers.h"
 
 #ifdef DBGC_CLASS
 #undef DBGC_CLASS

diff --git a/nsswitch/wins.c b/nsswitch/wins.c
index 371ab78d2f877712e923b91302f7c55653c78f82..4f79cc67a1dceb75b12971442cae4eb628d41702 100644 (file)
--- a/nsswitch/wins.c
+++ b/nsswitch/wins.c
@@ -21,6 +21,7 @@
 #include "includes.h"
 #include "nsswitch/winbind_client.h"
 #include "nsswitch/libwbclient/wbclient.h"
+#include "lib/util/string_wrappers.h"
 
 #ifdef HAVE_NS_API_H
 

diff --git a/source3/auth/auth_builtin.c b/source3/auth/auth_builtin.c
index f16b3cc2934e71d2b9d9c8fcb00454b31aa061c7..046b9793e33ed718fd4f72cabd5a7addf4168e2a 100644 (file)
--- a/source3/auth/auth_builtin.c
+++ b/source3/auth/auth_builtin.c
@@ -20,6 +20,7 @@
 
 #include "includes.h"
 #include "auth.h"
+#include "lib/util/string_wrappers.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_AUTH

diff --git a/source3/auth/pampass.c b/source3/auth/pampass.c
index 751cee61ce16e0703e86b8aa9b14402763540fa2..c3c3d82c77d554c66a6e3be36a2405d685acb44f 100644 (file)
--- a/source3/auth/pampass.c
+++ b/source3/auth/pampass.c
@@ -29,6 +29,7 @@
 #include "includes.h"
 #include "auth.h"
 #include "../libcli/auth/pam_errors.h"
+#include "lib/util/string_wrappers.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_AUTH

diff --git a/source3/client/client.c b/source3/client/client.c
index 30287ffd253ddc00f6324f0c60419a567df33cd7..3d467498920fa540dbf84bdfe5f0dcf08761b387 100644 (file)
--- a/source3/client/client.c
+++ b/source3/client/client.c
@@ -40,6 +40,7 @@
 #include "include/ntioctl.h"
 #include "../libcli/smb/smbXcli_base.h"
 #include "lib/util/time_basic.h"
+#include "lib/util/string_wrappers.h"
 
 #ifndef REGISTER
 #define REGISTER 0

diff --git a/source3/include/safe_string.h b/source3/include/safe_string.h
index 03878b48f51a70b355ef69c8922eff5e678f8b7e..4609e3a45fd02a58bc360321f47409e28fd02df1 100644 (file)
--- a/source3/include/safe_string.h
+++ b/source3/include/safe_string.h
@@ -62,6 +62,4 @@
 
 #endif /* !_SPLINT_ */
 
-#include "lib/util/string_wrappers.h"
-
 #endif

diff --git a/source3/lib/idmap_cache.c b/source3/lib/idmap_cache.c
index d5a60e734034c3f31b2734a2da4bf600720fea1b..a4b8861f4663d389c67e74d0b40982dc057e50d6 100644 (file)
--- a/source3/lib/idmap_cache.c
+++ b/source3/lib/idmap_cache.c
@@ -22,6 +22,7 @@
 #include "../libcli/security/security.h"
 #include "../librpc/gen_ndr/idmap.h"
 #include "lib/gencache.h"
+#include "lib/util/string_wrappers.h"
 
 /**
  * Find a sid2xid mapping

diff --git a/source3/lib/privileges.c b/source3/lib/privileges.c
index 19412133342512b578c2fc4d559e9dfb433e1e8e..9900aa6f93bd59ebdb39abdeefc4fd4664f6e594 100644 (file)
--- a/source3/lib/privileges.c
+++ b/source3/lib/privileges.c
@@ -27,6 +27,7 @@
 #include "libcli/security/privileges_private.h"
 #include "../libcli/security/security.h"
 #include "passdb.h"
+#include "lib/util/string_wrappers.h"
 
 #define PRIVPREFIX              "PRIV_"
 

diff --git a/source3/lib/string_replace.c b/source3/lib/string_replace.c
index 25486afcbd4e1eb1e70db2d9555332af91c4d974..42022d78ab9ecec2e15cd1930e48bc448429405d 100644 (file)
--- a/source3/lib/string_replace.c
+++ b/source3/lib/string_replace.c
@@ -23,6 +23,7 @@
 #include "includes.h"
 #include "smbd/smbd.h"
 #include "string_replace.h"
+#include "lib/util/string_wrappers.h"
 
 #define MAP_SIZE        0xFF
 #define MAP_NUM         0x101 /* max unicode charval / MAP_SIZE */

diff --git a/source3/lib/substitute.c b/source3/lib/substitute.c
index 833af10b6f03faebbc4a64b357e8a6729f59b62a..e359ef89494ed3620b01c964f90b3faa2443ba57 100644 (file)
--- a/source3/lib/substitute.c
+++ b/source3/lib/substitute.c
@@ -23,6 +23,7 @@
 #include "system/passwd.h"
 #include "secrets.h"
 #include "auth.h"
+#include "lib/util/string_wrappers.h"
 
 /* Max DNS name is 253 + '\0' */
 #define MACHINE_NAME_SIZE 254

diff --git a/source3/lib/username.c b/source3/lib/username.c
index f69d9c3bf2282b6cc12e0bf0f97acdffbef07126..280285e25d2c471f4a8842d04b57313a82301c5e 100644 (file)
--- a/source3/lib/username.c
+++ b/source3/lib/username.c
@@ -23,6 +23,7 @@
 #include "system/passwd.h"
 #include "../lib/util/memcache.h"
 #include "../lib/util/util_pw.h"
+#include "lib/util/string_wrappers.h"
 
 /* internal functions */
 static struct passwd *uname_string_combinations(char *s, TALLOC_CTX *mem_ctx,

diff --git a/source3/lib/util.c b/source3/lib/util.c
index a51c4aaf5140244dad2af317084e30d293501053..62584bc7ca2b82158b72ef5d8a173e0d80e33203 100644 (file)
--- a/source3/lib/util.c
+++ b/source3/lib/util.c
@@ -37,6 +37,7 @@
 #include "lib/util/util_process.h"
 #include "lib/dbwrap/dbwrap_ctdb.h"
 #include "lib/gencache.h"
+#include "lib/util/string_wrappers.h"
 
 #ifdef HAVE_SYS_PRCTL_H
 #include <sys/prctl.h>

diff --git a/source3/lib/util_sd.c b/source3/lib/util_sd.c
index 39083b154385deffd7449168935a314b7f4e5fea..bcf152b22cf341f1da44176c04d53473973f91d2 100644 (file)
--- a/source3/lib/util_sd.c
+++ b/source3/lib/util_sd.c
@@ -28,6 +28,7 @@
 #include "../libcli/security/security.h"
 #include "rpc_client/cli_pipe.h"
 #include "rpc_client/cli_lsarpc.h"
+#include "lib/util/string_wrappers.h"
 
 /* These values discovered by inspection */
 

diff --git a/source3/lib/util_sid.c b/source3/lib/util_sid.c
index 57cd76c108d31128e750078e1daeff8576ce6d2a..806f860136bbcb729a72856458e1d58d023fcf89 100644 (file)
--- a/source3/lib/util_sid.c
+++ b/source3/lib/util_sid.c
@@ -26,6 +26,7 @@
 #include "../librpc/gen_ndr/ndr_security.h"
 #include "../librpc/gen_ndr/netlogon.h"
 #include "../libcli/security/security.h"
+#include "lib/util/string_wrappers.h"
 
 
 /*****************************************************************

diff --git a/source3/lib/wins_srv.c b/source3/lib/wins_srv.c
index 23796a2c5f427166018f9eaf862fae62e05419ba..2f28a4de6fb4f19635d82d4faa77dbd57e3476d4 100644 (file)
--- a/source3/lib/wins_srv.c
+++ b/source3/lib/wins_srv.c
@@ -21,6 +21,7 @@
 
 #include "includes.h"
 #include "lib/gencache.h"
+#include "lib/util/string_wrappers.h"
 
 /*
   This is pretty much a complete rewrite of the earlier code. The main

diff --git a/source3/libnet/libnet_dssync_passdb.c b/source3/libnet/libnet_dssync_passdb.c
index ac668bc3b474be8bc6c82a7c21350ba1e2193209..4472a9c4b5f39400736330decfa8ce79de3de1e6 100644 (file)
--- a/source3/libnet/libnet_dssync_passdb.c
+++ b/source3/libnet/libnet_dssync_passdb.c
@@ -29,6 +29,7 @@
 #include "../libds/common/flag_mapping.h"
 #include "passdb.h"
 #include "lib/util/base64.h"
+#include "lib/util/string_wrappers.h"
 
 /****************************************************************
 ****************************************************************/

diff --git a/source3/librpc/crypto/gse_krb5.c b/source3/librpc/crypto/gse_krb5.c
index d3db3fe03e1d8073e88ca15c797c6d9635a214ec..e1319fc832937d3d2cfdbedabfb5aa626520fd22 100644 (file)
--- a/source3/librpc/crypto/gse_krb5.c
+++ b/source3/librpc/crypto/gse_krb5.c
@@ -24,6 +24,7 @@
 #include "gse_krb5.h"
 #include "lib/param/loadparm.h"
 #include "libads/kerberos_proto.h"
+#include "lib/util/string_wrappers.h"
 
 #ifdef HAVE_KRB5
 

diff --git a/source3/libsmb/cli_smb2_fnum.c b/source3/libsmb/cli_smb2_fnum.c
index 8bf6629b9a1e75d27ee932c06756b454f74b13f6..2b8f9a0e7420011c91ff14bd1e0e3a1ef22b4cb1 100644 (file)
--- a/source3/libsmb/cli_smb2_fnum.c
+++ b/source3/libsmb/cli_smb2_fnum.c
@@ -42,6 +42,7 @@
 #include "librpc/gen_ndr/ndr_ioctl.h"
 #include "ntioctl.h"
 #include "librpc/gen_ndr/ndr_quota.h"
+#include "lib/util/string_wrappers.h"
 
 struct smb2_hnd {
        uint64_t fid_persistent;

diff --git a/source3/libsmb/clidgram.c b/source3/libsmb/clidgram.c
index bed507626c1ec1d073c714b555871a87c020347b..ec0b1efa8ce171b9b93a28e31f1d92967e7ecb31 100644 (file)
--- a/source3/libsmb/clidgram.c
+++ b/source3/libsmb/clidgram.c
@@ -28,6 +28,7 @@
 #include "messages.h"
 #include "librpc/gen_ndr/samr.h"
 #include "../lib/util/pidfile.h"
+#include "lib/util/string_wrappers.h"
 
 /*
  * cli_send_mailslot, send a mailslot for client code ...

diff --git a/source3/libsmb/cliprint.c b/source3/libsmb/cliprint.c
index c7888e9b387a1fc44fb66f429cdc1641c007296e..309a108a72c1c86375af7b25fe3383ca08368122 100644 (file)
--- a/source3/libsmb/cliprint.c
+++ b/source3/libsmb/cliprint.c
@@ -21,6 +21,7 @@
 #include "libsmb/libsmb.h"
 #include "libsmb/clirap.h"
 #include "../libcli/smb/smbXcli_base.h"
+#include "lib/util/string_wrappers.h"
 
 /*****************************************************************************
  Convert a character pointer in a cli_call_api() response to a form we can use.

diff --git a/source3/libsmb/clirap.c b/source3/libsmb/clirap.c
index a52fe3162b1a4db9a28fc7b0cbcc52404523eb46..3b47fd73323e4a5c8af16b59e71091a5a028ff8f 100644 (file)
--- a/source3/libsmb/clirap.c
+++ b/source3/libsmb/clirap.c
@@ -29,6 +29,7 @@
 #include "trans2.h"
 #include "../libcli/smb/smbXcli_base.h"
 #include "cli_smb2_fnum.h"
+#include "lib/util/string_wrappers.h"
 
 #include <gnutls/gnutls.h>
 #include <gnutls/crypto.h>

diff --git a/source3/libsmb/libsmb_dir.c b/source3/libsmb/libsmb_dir.c
index b4ebc90bf49bf2122785b5a16bae1f0b34a3eaa5..1f1e3feeadd86cc36c64a5e255ea6187756d2ac5 100644 (file)
--- a/source3/libsmb/libsmb_dir.c
+++ b/source3/libsmb/libsmb_dir.c
@@ -35,6 +35,7 @@
 #include "../libcli/security/security.h"
 #include "lib/util/tevent_ntstatus.h"
 #include "lib/util/time_basic.h"
+#include "lib/util/string_wrappers.h"
 
 /*
  * Routine to open a directory

diff --git a/source3/libsmb/libsmb_xattr.c b/source3/libsmb/libsmb_xattr.c
index d1b6548eb902655dc0344019eaad5a7b28d33c9b..c5aa1b571f1ec93452ebb58a534b9851269cea4e 100644 (file)
--- a/source3/libsmb/libsmb_xattr.c
+++ b/source3/libsmb/libsmb_xattr.c
@@ -30,6 +30,7 @@
 #include "rpc_client/rpc_client.h"
 #include "rpc_client/cli_lsarpc.h"
 #include "../libcli/security/security.h"
+#include "lib/util/string_wrappers.h"
 
 /*
  * Find an lsa pipe handle associated with a cli struct.

diff --git a/source3/libsmb/namequery.c b/source3/libsmb/namequery.c
index 57ef58ec12eee060b5c568bd515f6efb6e5763b2..242ec2915ee68fd80694db9885b34b47a2cda1c6 100644 (file)
--- a/source3/libsmb/namequery.c
+++ b/source3/libsmb/namequery.c
@@ -33,6 +33,7 @@
 #include "lib/gencache.h"
 #include "librpc/gen_ndr/dns.h"
 #include "lib/util/util_net.h"
+#include "lib/util/string_wrappers.h"
 
 /* nmbd.c sets this to True. */
 bool global_in_nmbd = False;

diff --git a/source3/libsmb/namequery_dc.c b/source3/libsmb/namequery_dc.c
index f63dde61603a2140f77c17f77065bd235f6625cb..77a7ce30e351d3515fb9a79527f42ef96ed6cf4e 100644 (file)
--- a/source3/libsmb/namequery_dc.c
+++ b/source3/libsmb/namequery_dc.c
@@ -28,6 +28,7 @@
 #include "ads.h"
 #include "../librpc/gen_ndr/nbt.h"
 #include "lib/param/loadparm.h"
+#include "lib/util/string_wrappers.h"
 
 /**********************************************************************
  Is this our primary domain ?

diff --git a/source3/libsmb/nmblib.c b/source3/libsmb/nmblib.c
index a5e691a1c86081363752e025459e46cad2983f03..ff009092bbf75ce6667367298c5ec78857b54cb0 100644 (file)
--- a/source3/libsmb/nmblib.c
+++ b/source3/libsmb/nmblib.c
@@ -21,6 +21,7 @@
 
 #include "includes.h"
 #include "libsmb/nmblib.h"
+#include "lib/util/string_wrappers.h"
 
 static const struct opcode_names {
        const char *nmb_opcode_name;

diff --git a/source3/modules/vfs_afsacl.c b/source3/modules/vfs_afsacl.c
index d3ecfef46f1f8edbdcf61715582dba9dc0b7f3b2..c4aa200cc7eccf3d87bd78ef896feb5d8e948c65 100644 (file)
--- a/source3/modules/vfs_afsacl.c
+++ b/source3/modules/vfs_afsacl.c
@@ -25,6 +25,7 @@
 #include "../libcli/security/dom_sid.h"
 #include "passdb.h"
 #include "lib/afs/afs_settoken.h"
+#include "lib/util/string_wrappers.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_VFS

diff --git a/source3/modules/vfs_default.c b/source3/modules/vfs_default.c
index cf5e1cbc296c25e67ccde38a72eed208cc9892f9..30f568c5e80f7a40d2ca24d9d235583b48abd339 100644 (file)
--- a/source3/modules/vfs_default.c
+++ b/source3/modules/vfs_default.c
@@ -36,6 +36,7 @@
 #include "librpc/gen_ndr/ndr_ioctl.h"
 #include "offload_token.h"
 #include "util_reparse.h"
+#include "lib/util/string_wrappers.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_VFS

diff --git a/source3/modules/vfs_full_audit.c b/source3/modules/vfs_full_audit.c
index 9d89bfd396ad4e179b29ec5326a9aa7c80fdba4c..82f60f8a68b263d8dbf1408fd010657c8b0262e7 100644 (file)
--- a/source3/modules/vfs_full_audit.c
+++ b/source3/modules/vfs_full_audit.c
@@ -72,6 +72,7 @@
 #include "libcli/security/sddl.h"
 #include "passdb/machine_sid.h"
 #include "lib/util/tevent_ntstatus.h"
+#include "lib/util/string_wrappers.h"
 
 static int vfs_full_audit_debug_level = DBGC_VFS;
 

diff --git a/source3/nmbd/nmbd_become_lmb.c b/source3/nmbd/nmbd_become_lmb.c
index 80c699f2d91a32ea3fbc39cc78f92b2c4c798965..40f8b1b76f0f7e1a6328a5b708eec1fe8d0d60e0 100644 (file)
--- a/source3/nmbd/nmbd_become_lmb.c
+++ b/source3/nmbd/nmbd_become_lmb.c
@@ -23,6 +23,7 @@
 #include "includes.h"
 #include "nmbd/nmbd.h"
 #include "../librpc/gen_ndr/svcctl.h"
+#include "lib/util/string_wrappers.h"
 
 extern uint16_t samba_nb_type; /* Samba's NetBIOS name type. */
 

diff --git a/source3/nmbd/nmbd_browserdb.c b/source3/nmbd/nmbd_browserdb.c
index b883f569c196ae889eaf8ed6055ee59ccd2d24a6..b5fdbab95c656c0f1fa0c0aa27bc3b3fccabe600 100644 (file)
--- a/source3/nmbd/nmbd_browserdb.c
+++ b/source3/nmbd/nmbd_browserdb.c
@@ -28,6 +28,7 @@
 
 #include "includes.h"
 #include "nmbd/nmbd.h"
+#include "lib/util/string_wrappers.h"
 
 /* -------------------------------------------------------------------------- **
  * Variables...

diff --git a/source3/nmbd/nmbd_browsesync.c b/source3/nmbd/nmbd_browsesync.c
index 6f90e613478cdb00121fbcc3f04298d6cbe2b154..181787df41015d69b7c853f8f9405d03099d58fb 100644 (file)
--- a/source3/nmbd/nmbd_browsesync.c
+++ b/source3/nmbd/nmbd_browsesync.c
@@ -22,6 +22,7 @@
 
 #include "includes.h"
 #include "nmbd/nmbd.h"
+#include "lib/util/string_wrappers.h"
 
 /* This is our local master browser list database. */
 extern struct browse_cache_record *lmb_browserlist;

diff --git a/source3/nmbd/nmbd_elections.c b/source3/nmbd/nmbd_elections.c
index 16988c8aec8c5854ec64d3f1ced6321ecc27eb45..41470ea314ea8cd22b41b344149f2d48004e0113 100644 (file)
--- a/source3/nmbd/nmbd_elections.c
+++ b/source3/nmbd/nmbd_elections.c
@@ -22,6 +22,7 @@
 
 #include "includes.h"
 #include "nmbd/nmbd.h"
+#include "lib/util/string_wrappers.h"
 
 /* Election parameters. */
 extern time_t StartupTime;

diff --git a/source3/nmbd/nmbd_incomingdgrams.c b/source3/nmbd/nmbd_incomingdgrams.c
index e8980055b19ccb7512f41bb6e8e443eeb5e0f4e3..80fb30462b06f56f2ca60633d9969f7a8f339b61 100644 (file)
--- a/source3/nmbd/nmbd_incomingdgrams.c
+++ b/source3/nmbd/nmbd_incomingdgrams.c
@@ -23,6 +23,7 @@
 #include "includes.h"
 #include "../librpc/gen_ndr/svcctl.h"
 #include "nmbd/nmbd.h"
+#include "lib/util/string_wrappers.h"
 
 extern bool found_lm_clients;
 

diff --git a/source3/nmbd/nmbd_nameregister.c b/source3/nmbd/nmbd_nameregister.c
index 4a23c3a42b9c2e8aa1ab16d49c3144dc9aef97e6..ab3764790cccbbfe87db77cfd4966a7266046a18 100644 (file)
--- a/source3/nmbd/nmbd_nameregister.c
+++ b/source3/nmbd/nmbd_nameregister.c
@@ -22,6 +22,7 @@
 
 #include "includes.h"
 #include "nmbd/nmbd.h"
+#include "lib/util/string_wrappers.h"
 
 /* forward declarations */
 static void wins_next_registration(struct response_record *rrec);

diff --git a/source3/nmbd/nmbd_packets.c b/source3/nmbd/nmbd_packets.c
index be9e091f0062d78a33c17a8be3d79b5f12443244..a1d8deec0f32cfc2447b4c5f9461001295ecc0c8 100644 (file)
--- a/source3/nmbd/nmbd_packets.c
+++ b/source3/nmbd/nmbd_packets.c
@@ -25,6 +25,7 @@
 #include "system/select.h"
 #include "libsmb/libsmb.h"
 #include "libsmb/unexpected.h"
+#include "lib/util/string_wrappers.h"
 
 extern int ClientNMB;
 extern int ClientDGRAM;

diff --git a/source3/nmbd/nmbd_sendannounce.c b/source3/nmbd/nmbd_sendannounce.c
index f4c852ba0b88993edf7f8415c1d162fa03e8127d..b7ee2830001c6651e716a179ea4d3bb22a9fc0b6 100644 (file)
--- a/source3/nmbd/nmbd_sendannounce.c
+++ b/source3/nmbd/nmbd_sendannounce.c
@@ -26,6 +26,7 @@
 #include "includes.h"
 #include "../librpc/gen_ndr/svcctl.h"
 #include "nmbd/nmbd.h"
+#include "lib/util/string_wrappers.h"
 
 extern int  updatecount;
 extern bool found_lm_clients;

diff --git a/source3/nmbd/nmbd_serverlistdb.c b/source3/nmbd/nmbd_serverlistdb.c
index e7cb36a2de26b1e646de92c51e265eaae560e570..8dbc43c3504d0b8ac1a357a3f32a29a2c23ee57a 100644 (file)
--- a/source3/nmbd/nmbd_serverlistdb.c
+++ b/source3/nmbd/nmbd_serverlistdb.c
@@ -24,6 +24,7 @@
 #include "system/filesys.h"
 #include "../librpc/gen_ndr/svcctl.h"
 #include "nmbd/nmbd.h"
+#include "lib/util/string_wrappers.h"
 
 int updatecount = 0;
 

diff --git a/source3/nmbd/nmbd_synclists.c b/source3/nmbd/nmbd_synclists.c
index 53b4f12903819e9109a9f94fe1851a51805e9eda..a65cbb87e0e254ac929139bfe67f7093fc9e15eb 100644 (file)
--- a/source3/nmbd/nmbd_synclists.c
+++ b/source3/nmbd/nmbd_synclists.c
@@ -32,6 +32,7 @@
 #include "libsmb/libsmb.h"
 #include "libsmb/clirap.h"
 #include "../libcli/smb/smbXcli_base.h"
+#include "lib/util/string_wrappers.h"
 
 struct sync_record {
        struct sync_record *next, *prev;

diff --git a/source3/nmbd/nmbd_workgroupdb.c b/source3/nmbd/nmbd_workgroupdb.c
index 14bc941b8723a840324502e72f54b0a584743381..cd97efd8273aa1f45059b4afd6082b878f0f91d3 100644 (file)
--- a/source3/nmbd/nmbd_workgroupdb.c
+++ b/source3/nmbd/nmbd_workgroupdb.c
@@ -23,6 +23,7 @@
 #include "includes.h"
 #include "../librpc/gen_ndr/svcctl.h"
 #include "nmbd/nmbd.h"
+#include "lib/util/string_wrappers.h"
 
 extern uint16_t samba_nb_type;
 

diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 9c2d7634d36a4c7010a6b9ad2b1a92f3172f17cf..c218e2fc372444f16168c386e123081fc38ff169 100644 (file)
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -74,6 +74,7 @@
 #include "source4/lib/tls/tls.h"
 #include "libcli/auth/ntlm_check.h"
 #include "lib/crypto/gnutls_helpers.h"
+#include "lib/util/string_wrappers.h"
 
 #ifdef HAVE_SYS_SYSCTL_H
 #include <sys/sysctl.h>

diff --git a/source3/passdb/machine_account_secrets.c b/source3/passdb/machine_account_secrets.c
index 5cda8f065c4efe22102bd25e29c6efe0b333abf0..d81f79c705b4fa19b2cf694e4a8776e7e403ec56 100644 (file)
--- a/source3/passdb/machine_account_secrets.c
+++ b/source3/passdb/machine_account_secrets.c
@@ -37,6 +37,7 @@
 #include "lib/krb5_wrap/krb5_samba.h"
 #include "lib/util/time_basic.h"
 #include "../libds/common/flags.h"
+#include "lib/util/string_wrappers.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_PASSDB

diff --git a/source3/passdb/passdb.c b/source3/passdb/passdb.c
index 8ed1bafcea32083c2a1dabf2ade26f00310c9330..a598d75fb047bc3e591009893903177f504897cc 100644 (file)
--- a/source3/passdb/passdb.c
+++ b/source3/passdb/passdb.c
@@ -32,6 +32,7 @@
 #include "util_tdb.h"
 #include "auth/credentials/credentials.h"
 #include "lib/param/param.h"
+#include "lib/util/string_wrappers.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_PASSDB

diff --git a/source3/passdb/pdb_interface.c b/source3/passdb/pdb_interface.c
index 03aa4ff8472198a4600797073cbcc97b5ac93467..cdfa4903916e77fd759afe998840f85d887d9844 100644 (file)
--- a/source3/passdb/pdb_interface.c
+++ b/source3/passdb/pdb_interface.c
@@ -37,6 +37,7 @@
 #include "passdb/pdb_secrets.h"
 #include "lib/util_sid_passdb.h"
 #include "idmap_cache.h"
+#include "lib/util/string_wrappers.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_PASSDB

diff --git a/source3/passdb/pdb_ldap.c b/source3/passdb/pdb_ldap.c
index ba82c9833c66da69c81e77a281a3fbaccda36bb0..e6d8a84c60fa22cf52c92ac06cff839ce6590c62 100644 (file)
--- a/source3/passdb/pdb_ldap.c
+++ b/source3/passdb/pdb_ldap.c
@@ -55,6 +55,7 @@
 #include "lib/param/loadparm.h"
 #include "lib/util_sid_passdb.h"
 #include "lib/util/smb_strtox.h"
+#include "lib/util/string_wrappers.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_PASSDB

diff --git a/source3/passdb/pdb_smbpasswd.c b/source3/passdb/pdb_smbpasswd.c
index 76cfddfb195c5007a634b5b579fc639080a5fc1e..515e5f9f84d321ce770fc8cfe1fcec744576e338 100644 (file)
--- a/source3/passdb/pdb_smbpasswd.c
+++ b/source3/passdb/pdb_smbpasswd.c
@@ -27,6 +27,7 @@
 #include "../librpc/gen_ndr/samr.h"
 #include "../libcli/security/security.h"
 #include "passdb/pdb_smbpasswd.h"
+#include "lib/util/string_wrappers.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_PASSDB

diff --git a/source3/passdb/pdb_tdb.c b/source3/passdb/pdb_tdb.c
index 0f7e2a919f49cd08d0672cb3968aa4afa21d3e0a..161030fed8b9aba4096a75f9191b6e9998b25a94 100644 (file)
--- a/source3/passdb/pdb_tdb.c
+++ b/source3/passdb/pdb_tdb.c
@@ -31,6 +31,7 @@
 #include "util_tdb.h"
 #include "passdb/pdb_tdb.h"
 #include "lib/util/smb_strtox.h"
+#include "lib/util/string_wrappers.h"
 
 #if 0 /* when made a module use this */
 

diff --git a/source3/passdb/py_passdb.c b/source3/passdb/py_passdb.c
index 70238e43d4176145eaeb9aba16c16e99ed9368e6..b9b4ae95d06ae9d605f4b5be893d85b533ec7853 100644 (file)
--- a/source3/passdb/py_passdb.c
+++ b/source3/passdb/py_passdb.c
@@ -27,6 +27,7 @@
 #include "passdb.h"
 #include "secrets.h"
 #include "idmap.h"
+#include "lib/util/string_wrappers.h"
 
 #ifndef Py_TYPE /* Py_TYPE is only available on Python > 2.6 */
 #define Py_TYPE(ob)             (((PyObject*)(ob))->ob_type)

diff --git a/source3/printing/lpq_parse.c b/source3/printing/lpq_parse.c
index 91fc2ead7120e46898c130b18515d94195985691..d7a63a59f271c4ec9da31a02c11f2e151c73f02c 100644 (file)
--- a/source3/printing/lpq_parse.c
+++ b/source3/printing/lpq_parse.c
@@ -19,6 +19,7 @@
 
 #include "includes.h"
 #include "printing.h"
+#include "lib/util/string_wrappers.h"
 
 static const char *Months[13] = { "Jan", "Feb", "Mar", "Apr", "May", "Jun",
                              "Jul", "Aug", "Sep", "Oct", "Nov", "Dec", "Err"};

diff --git a/source3/printing/notify.c b/source3/printing/notify.c
index d09c12ade775ae2a57254d6810ef78404a97e1a2..8312b0b612d94b4eb365bcb171bad38c6f459bf0 100644 (file)
--- a/source3/printing/notify.c
+++ b/source3/printing/notify.c
@@ -26,6 +26,7 @@
 #include "printing/notify.h"
 #include "messages.h"
 #include "util_tdb.h"
+#include "lib/util/string_wrappers.h"
 
 static TALLOC_CTX *send_ctx;
 

diff --git a/source3/printing/nt_printing.c b/source3/printing/nt_printing.c
index 2030c4c2395d96d3aab86051c4f228c19406c2c5..355953fa22262a4db9afa27fd738cfafe6795720 100644 (file)
--- a/source3/printing/nt_printing.c
+++ b/source3/printing/nt_printing.c
@@ -34,6 +34,7 @@
 #include "messages.h"
 #include "rpc_server/spoolss/srv_spoolss_nt.h"
 #include "rpc_client/cli_winreg_spoolss.h"
+#include "lib/util/string_wrappers.h"
 
 /* Map generic permissions to printer object specific permissions */
 

diff --git a/source3/printing/nt_printing_tdb.c b/source3/printing/nt_printing_tdb.c
index 0193b177aece5c21fd97ae04acee34477278d5f4..7db3c073a2b7f622197c13a30d82283e3ee5dd60 100644 (file)
--- a/source3/printing/nt_printing_tdb.c
+++ b/source3/printing/nt_printing_tdb.c
@@ -27,6 +27,7 @@
 #include "librpc/gen_ndr/ndr_security.h"
 #include "libcli/security/security.h"
 #include "util_tdb.h"
+#include "lib/util/string_wrappers.h"
 
 #define FORMS_PREFIX "FORMS/"
 #define DRIVERS_PREFIX "DRIVERS/"

diff --git a/source3/printing/print_cups.c b/source3/printing/print_cups.c
index b52f7e25da552ecc9b00f24366d04b00b4343792..0bbd7c8eff38d3a44bb6b15bde5a56bf7f5ada23 100644 (file)
--- a/source3/printing/print_cups.c
+++ b/source3/printing/print_cups.c
@@ -27,6 +27,7 @@
 #include "printing/pcap.h"
 #include "librpc/gen_ndr/ndr_printcap.h"
 #include "lib/util/sys_rw.h"
+#include "lib/util/string_wrappers.h"
 
 #ifdef HAVE_CUPS
 #include <cups/cups.h>

diff --git a/source3/printing/print_iprint.c b/source3/printing/print_iprint.c
index f75aa0a12ac3ae3fc8bf6a61dadd962b4b1763a0..f10dee08c4a2f28ffb91467375bf8ec554ba78ae 100644 (file)
--- a/source3/printing/print_iprint.c
+++ b/source3/printing/print_iprint.c
@@ -22,6 +22,7 @@
 #include "includes.h"
 #include "printing.h"
 #include "printing/pcap.h"
+#include "lib/util/string_wrappers.h"
 
 #ifdef HAVE_IPRINT
 #include <cups/cups.h>

diff --git a/source3/printing/printing.c b/source3/printing/printing.c
index 3c74efb9657b4c2fc61126131a419596ec4505ea..2798f629bcbf93cfa02d78c84178d706a32c9c47 100644 (file)
--- a/source3/printing/printing.c
+++ b/source3/printing/printing.c
@@ -37,6 +37,7 @@
 #include "util_tdb.h"
 #include "lib/param/loadparm.h"
 #include "lib/util/sys_rw_data.h"
+#include "lib/util/string_wrappers.h"
 
 extern userdom_struct current_user_info;
 

diff --git a/source3/printing/printing_db.c b/source3/printing/printing_db.c
index 3fa85579f20b6e0da3943ce3a83f97a07814e1c2..d54a39a9922bdd9a3f724edc030de8067ad89013 100644 (file)
--- a/source3/printing/printing_db.c
+++ b/source3/printing/printing_db.c
@@ -24,6 +24,7 @@
 #include "system/filesys.h"
 #include "printing.h"
 #include "util_tdb.h"
+#include "lib/util/string_wrappers.h"
 
 static struct tdb_print_db *print_db_head;
 

diff --git a/source3/registry/reg_objects.c b/source3/registry/reg_objects.c
index f0640b504d8c704482c3cb4f0c6c7e6acaf4848e..3a091478dec4eac66785afec0b9142a830d88938 100644 (file)
--- a/source3/registry/reg_objects.c
+++ b/source3/registry/reg_objects.c
@@ -27,6 +27,7 @@
 #include "dbwrap/dbwrap.h"
 #include "dbwrap/dbwrap_rbt.h"
 #include "../libcli/registry/util_reg.h"
+#include "lib/util/string_wrappers.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_REGISTRY

diff --git a/source3/rpc_server/spoolss/srv_spoolss_nt.c b/source3/rpc_server/spoolss/srv_spoolss_nt.c
index e98401a4365a24d6c2b18ebd59cdda95cae6c965..d746067d250fec145879ab369ad5a0ca8134f3e8 100644 (file)
--- a/source3/rpc_server/spoolss/srv_spoolss_nt.c
+++ b/source3/rpc_server/spoolss/srv_spoolss_nt.c
@@ -63,6 +63,7 @@
 #include "rpc_server/rpc_server.h"
 #include "librpc/rpc/dcesrv_core.h"
 #include "printing/nt_printing_migrate_internal.h"
+#include "lib/util/string_wrappers.h"
 
 /* macros stolen from s4 spoolss server */
 #define SPOOLSS_BUFFER_UNION(fn,info,level) \

diff --git a/source3/rpcclient/cmd_spoolss.c b/source3/rpcclient/cmd_spoolss.c
index 85062541da222b8236ccf8e70d49f140c40d6760..3b7abc665bd926e954c4e1da12c7f4303023b018 100644 (file)
--- a/source3/rpcclient/cmd_spoolss.c
+++ b/source3/rpcclient/cmd_spoolss.c
@@ -35,6 +35,7 @@
 #include "libsmb/libsmb.h"
 #include "popt_common_cmdline.h"
 #include "lib/util/smb_strtox.h"
+#include "lib/util/string_wrappers.h"
 
 #define RPCCLIENT_PRINTERNAME(_printername, _cli, _arg) \
 { \

diff --git a/source3/rpcclient/cmd_srvsvc.c b/source3/rpcclient/cmd_srvsvc.c
index 478afc68cd147b5428cd759329df687aff50f861..073e51da4397cd73c5d25561ea89f61a8edcd74c 100644 (file)
--- a/source3/rpcclient/cmd_srvsvc.c
+++ b/source3/rpcclient/cmd_srvsvc.c
@@ -25,6 +25,7 @@
 #include "../librpc/gen_ndr/ndr_srvsvc.h"
 #include "../librpc/gen_ndr/ndr_srvsvc_c.h"
 #include "../libcli/security/display_sec.h"
+#include "lib/util/string_wrappers.h"
 
 /* Display server query info */
 

diff --git a/source3/smbd/dir.c b/source3/smbd/dir.c
index 51cd22d6c5a0cd24db0f87a6a2107f735d7221a5..41c760ec943db1ebbcc0c3a7f7cbd27d69636be7 100644 (file)
--- a/source3/smbd/dir.c
+++ b/source3/smbd/dir.c
@@ -26,6 +26,7 @@
 #include "lib/util/bitmap.h"
 #include "../lib/util/memcache.h"
 #include "../librpc/gen_ndr/open_files.h"
+#include "lib/util/string_wrappers.h"
 
 /*
    This module implements directory related functions for Samba.

diff --git a/source3/smbd/dosmode.c b/source3/smbd/dosmode.c
index 4012d6e64c9727e440bbc9674f7035d3d50e2fb2..8eef16404e0f55c6ac81e79a6c8a31c0b26713ef 100644 (file)
--- a/source3/smbd/dosmode.c
+++ b/source3/smbd/dosmode.c
@@ -27,6 +27,7 @@
 #include "smbd/smbd.h"
 #include "lib/param/loadparm.h"
 #include "lib/util/tevent_ntstatus.h"
+#include "lib/util/string_wrappers.h"
 
 static NTSTATUS get_file_handle_for_metadata(connection_struct *conn,
                                const struct smb_filename *smb_fname,

diff --git a/source3/smbd/lanman.c b/source3/smbd/lanman.c
index abbec164217c2e89a14b97c35880864433e04d03..31ccd28d02f043a5253869f6dead9f6c33168bff 100644 (file)
--- a/source3/smbd/lanman.c
+++ b/source3/smbd/lanman.c
@@ -43,6 +43,7 @@
 #include "passdb/machine_sid.h"
 #include "auth.h"
 #include "rpc_server/rpc_ncacn_np.h"
+#include "lib/util/string_wrappers.h"
 
 #ifdef CHECK_TYPES
 #undef CHECK_TYPES

diff --git a/source3/smbd/negprot.c b/source3/smbd/negprot.c
index 67ef60da8528b46e88551cd26ea572e40cfb1c6f..cd11c270f6b4ca05373d317672908c56cf0f338c 100644 (file)
--- a/source3/smbd/negprot.c
+++ b/source3/smbd/negprot.c
@@ -27,6 +27,7 @@
 #include "smbprofile.h"
 #include "auth/gensec/gensec.h"
 #include "../libcli/smb/smb_signing.h"
+#include "lib/util/string_wrappers.h"
 
 /*
  * MS-CIFS, 2.2.4.52.2 SMB_COM_NEGOTIATE Response:

diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c
index debdb8487b643ff422e165110a480f88f424cff2..a08d3df512b44b7b2a6fc0c2cf3e1a4d13af6ffb 100644 (file)
--- a/source3/smbd/reply.c
+++ b/source3/smbd/reply.c
@@ -47,6 +47,7 @@
 #include "librpc/gen_ndr/open_files.h"
 #include "smb1_utils.h"
 #include "libcli/smb/smb2_posix.h"
+#include "lib/util/string_wrappers.h"
 
 /****************************************************************************
  Ensure we check the path in *exactly* the same way as W2K for a findfirst/findnext

diff --git a/source3/smbd/service.c b/source3/smbd/service.c
index 43803e721c2a32f6c618458db6993b77c70b6f9e..b1ea0ea6a8851ba34f6a3f276135e1c663b0c4c8 100644 (file)
--- a/source3/smbd/service.c
+++ b/source3/smbd/service.c
@@ -33,6 +33,7 @@
 #include "messages.h"
 #include "lib/afs/afs_funcs.h"
 #include "lib/util_path.h"
+#include "lib/util/string_wrappers.h"
 
 bool canonicalize_connect_path(connection_struct *conn)
 {

diff --git a/source3/smbd/sesssetup.c b/source3/smbd/sesssetup.c
index 9550d35f3417cecf168800c88a100363bf2e59b8..89bec95c6cb6eb240400ceacbac8c0c11d0d86c5 100644 (file)
--- a/source3/smbd/sesssetup.c
+++ b/source3/smbd/sesssetup.c
@@ -33,6 +33,7 @@
 #include "../libcli/security/security.h"
 #include "auth/gensec/gensec.h"
 #include "../libcli/smb/smb_signing.h"
+#include "lib/util/string_wrappers.h"
 
 /****************************************************************************
  Add the standard 'Samba' signature to the end of the session setup.

diff --git a/source3/smbd/srvstr.c b/source3/smbd/srvstr.c
index c2d70b32c32459df892c9b3268685065ef4b497a..6ea3ea48a5991bc12169ce583014d322dab7fd8c 100644 (file)
--- a/source3/smbd/srvstr.c
+++ b/source3/smbd/srvstr.c
@@ -21,6 +21,7 @@
 #include "includes.h"
 #include "smbd/smbd.h"
 #include "smbd/globals.h"
+#include "lib/util/string_wrappers.h"
 
 /* Make sure we can't write a string past the end of the buffer */
 

diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c
index 16f8318663fb29d7cce0c7257053af1ac8c23804..d4cc62de502263a64245697a15a545d0d393e7d3 100644 (file)
--- a/source3/smbd/trans2.c
+++ b/source3/smbd/trans2.c
@@ -44,6 +44,7 @@
 #include "messages.h"
 #include "smb1_utils.h"
 #include "libcli/smb/smb2_posix.h"
+#include "lib/util/string_wrappers.h"
 
 #define DIR_ENTRY_SAFETY_MARGIN 4096
 

diff --git a/source3/torture/locktest2.c b/source3/torture/locktest2.c
index 92ddb7629b9ec77ef982d3bf9713fe3e69612c9c..62f60ee1fe44b2de01d542c99aa7784f1147ea99 100644 (file)
--- a/source3/torture/locktest2.c
+++ b/source3/torture/locktest2.c
@@ -21,6 +21,7 @@
 #include "libsmb/libsmb.h"
 #include "system/filesys.h"
 #include "locking/proto.h"
+#include "lib/util/string_wrappers.h"
 
 static fstring password;
 static fstring username;

diff --git a/source3/torture/mangle_test.c b/source3/torture/mangle_test.c
index 9886e38b5325c04b40ff25fb7b991ba32ef04937..5832a92cddac952f5897e43656812de3b64b937d 100644 (file)
--- a/source3/torture/mangle_test.c
+++ b/source3/torture/mangle_test.c
@@ -23,6 +23,7 @@
 #include "libsmb/libsmb.h"
 #include "libsmb/clirap.h"
 #include "util_tdb.h"
+#include "lib/util/string_wrappers.h"
 
 extern int torture_numops;
 

diff --git a/source3/torture/masktest.c b/source3/torture/masktest.c
index 95e0b04b04006e0c316c0757f1163ed31a4baed0..ac73a477a6b8aa891a5b26e936eb8a825119343e 100644 (file)
--- a/source3/torture/masktest.c
+++ b/source3/torture/masktest.c
@@ -23,6 +23,7 @@
 #include "libsmb/libsmb.h"
 #include "libsmb/nmblib.h"
 #include "../libcli/smb/smbXcli_base.h"
+#include "lib/util/string_wrappers.h"
 
 static fstring password;
 static fstring username;

diff --git a/source3/torture/torture.c b/source3/torture/torture.c
index a4edeefd62884510c46c8334aaa0f026cf87eb94..d2dedd8938fedcf7c61177cd3eaef5e61eb3af81 100644 (file)
--- a/source3/torture/torture.c
+++ b/source3/torture/torture.c
@@ -50,6 +50,7 @@
 #include "lib/util/asn1.h"
 #include "lib/param/param.h"
 #include "auth/gensec/gensec.h"
+#include "lib/util/string_wrappers.h"
 
 #include <gnutls/gnutls.h>
 #include <gnutls/crypto.h>

diff --git a/source3/torture/utable.c b/source3/torture/utable.c
index 666f21a27f5a85ed3c44a1173588cbe32d0b6dd6..a912c4cb3b065e5001dc547f61d289fcdc1e4ce5 100644 (file)
--- a/source3/torture/utable.c
+++ b/source3/torture/utable.c
@@ -23,6 +23,7 @@
 #include "../libcli/security/security.h"
 #include "libsmb/libsmb.h"
 #include "libsmb/clirap.h"
+#include "lib/util/string_wrappers.h"
 
 bool torture_utable(int dummy)
 {

diff --git a/source3/utils/conn_tdb.c b/source3/utils/conn_tdb.c
index 3d714382e1b58eaf68478dfd146e447f3041d465..9bdaf2c5161ff7271fda20388c722ece8803c024 100644 (file)
--- a/source3/utils/conn_tdb.c
+++ b/source3/utils/conn_tdb.c
@@ -26,6 +26,7 @@
 #include "messages.h"
 #include "conn_tdb.h"
 #include "util_tdb.h"
+#include "lib/util/string_wrappers.h"
 
 struct connections_forall_state {
        struct db_context *session_by_pid;

diff --git a/source3/utils/eventlogadm.c b/source3/utils/eventlogadm.c
index 2770fffa48ce1467a1e802069406dadc32807146..f831927dc42c20d857cbda83657a059171843785 100644 (file)
--- a/source3/utils/eventlogadm.c
+++ b/source3/utils/eventlogadm.c
@@ -31,6 +31,7 @@
 #include "registry/reg_backend_db.h"
 #include "../libcli/registry/util_reg.h"
 #include "cmdline_contexts.h"
+#include "lib/util/string_wrappers.h"
 
 extern int optind;
 extern char *optarg;

diff --git a/source3/utils/net_ads.c b/source3/utils/net_ads.c
index b615095c7e1c7efec24ace9bc94ec66f00053f6d..3eb139d0bb4b9f9aa00ac8e2177c2d9c3185fb86 100644 (file)
--- a/source3/utils/net_ads.c
+++ b/source3/utils/net_ads.c
@@ -41,6 +41,7 @@
 #include "lib/param/loadparm.h"
 #include "utils/net_dns.h"
 #include "auth/kerberos/pac_utils.h"
+#include "lib/util/string_wrappers.h"
 
 #ifdef HAVE_JANSSON
 #include <jansson.h>

diff --git a/source3/utils/net_groupmap.c b/source3/utils/net_groupmap.c
index b4da9bae556a1ece30e17536111fc7902d943012..68765a21fc89755755ce7a6c86f848594bdccdd7 100644 (file)
--- a/source3/utils/net_groupmap.c
+++ b/source3/utils/net_groupmap.c
@@ -26,6 +26,7 @@
 #include "utils/net.h"
 #include "../libcli/security/security.h"
 #include "passdb.h"
+#include "lib/util/string_wrappers.h"
 
 /*********************************************************
  Figure out if the input was an NT group or a SID string.

diff --git a/source3/utils/net_rpc.c b/source3/utils/net_rpc.c
index 956b6d02901dfaf413c90f42ccf1d72f43c87c4f..0a7c8429ff938982f3c948d89c7fe71c9b517eff 100644 (file)
--- a/source3/utils/net_rpc.c
+++ b/source3/utils/net_rpc.c
@@ -48,6 +48,7 @@
 #include "passdb.h"
 #include "../libcli/smb/smbXcli_base.h"
 #include "libsmb/dsgetdcname.h"
+#include "lib/util/string_wrappers.h"
 
 static int net_mode_share;
 static NTSTATUS sync_files(struct copy_clistate *cp_clistate, const char *mask);

diff --git a/source3/utils/net_rpc_printer.c b/source3/utils/net_rpc_printer.c
index af035a9b52e9f5fff36e07bef1fa7408408f6523..691ea821b5d0b32d4ffd02027399c3c53c7f1776 100644 (file)
--- a/source3/utils/net_rpc_printer.c
+++ b/source3/utils/net_rpc_printer.c
@@ -32,6 +32,7 @@
 #include "../libcli/smb/smbXcli_base.h"
 #include "auth/gensec/gensec.h"
 #include "auth/credentials/credentials.h"
+#include "lib/util/string_wrappers.h"
 
 /* support itanium as well */
 static const struct print_architecture_table_node archi_table[]= {

diff --git a/source3/utils/net_rpc_rights.c b/source3/utils/net_rpc_rights.c
index c37b04ebb9a1c91c641fe7259290a8e713ae9c6b..97844882fda50b8c92b0eb597affbce322dba656 100644 (file)
--- a/source3/utils/net_rpc_rights.c
+++ b/source3/utils/net_rpc_rights.c
@@ -24,6 +24,7 @@
 #include "rpc_client/cli_lsarpc.h"
 #include "rpc_client/init_lsa.h"
 #include "../libcli/security/security.h"
+#include "lib/util/string_wrappers.h"
 
 /********************************************************************
 ********************************************************************/

diff --git a/source3/utils/net_rpc_service.c b/source3/utils/net_rpc_service.c
index 35111a7931f6b100c0fe3a7122bf32e0576645f0..a0fbc51b95586ac7ccd7f361405797b116373595 100644 (file)
--- a/source3/utils/net_rpc_service.c
+++ b/source3/utils/net_rpc_service.c
@@ -21,6 +21,7 @@
 #include "rpc_client/rpc_client.h"
 #include "../librpc/gen_ndr/ndr_svcctl.h"
 #include "../librpc/gen_ndr/ndr_svcctl_c.h"
+#include "lib/util/string_wrappers.h"
 
 struct svc_state_msg {
        uint32_t flag;

diff --git a/source3/utils/net_sam.c b/source3/utils/net_sam.c
index 10d7e342253c6adc648c40ff37336b84bdbc7c2f..6a2c6c861f9e60530b57d4d843af38f4adde0322 100644 (file)
--- a/source3/utils/net_sam.c
+++ b/source3/utils/net_sam.c
@@ -32,6 +32,7 @@
 #include "secrets.h"
 #include "idmap.h"
 #include "lib/util/smb_strtox.h"
+#include "lib/util/string_wrappers.h"
 
 /*
  * Set a user's data

diff --git a/source3/utils/net_usershare.c b/source3/utils/net_usershare.c
index 637ef80135206dec9668123889694048264edfa7..50db771deb3539b893fbb085bcffc2ca939012a0 100644 (file)
--- a/source3/utils/net_usershare.c
+++ b/source3/utils/net_usershare.c
@@ -23,6 +23,7 @@
 #include "system/filesys.h"
 #include "utils/net.h"
 #include "../libcli/security/security.h"
+#include "lib/util/string_wrappers.h"
 
 struct {
        const char *us_errstr;

diff --git a/source3/utils/nmblookup.c b/source3/utils/nmblookup.c
index 2f50c5c8f5a8ac28633ba19ab505f6b12ca60075..388bb9b8a6415b92c4b3aee92aebbfc553a7befc 100644 (file)
--- a/source3/utils/nmblookup.c
+++ b/source3/utils/nmblookup.c
@@ -23,6 +23,7 @@
 #include "popt_common.h"
 #include "libsmb/nmblib.h"
 #include "libsmb/namequery.h"
+#include "lib/util/string_wrappers.h"
 
 static bool give_flags = false;
 static bool use_bcast = true;

diff --git a/source3/utils/ntlm_auth.c b/source3/utils/ntlm_auth.c
index 7f8d2688978d7d4a644c636a56f3e98b420761b7..bc14d2f228f37916ec7d85aa67d1f7a471f89507 100644 (file)
--- a/source3/utils/ntlm_auth.c
+++ b/source3/utils/ntlm_auth.c
@@ -48,6 +48,7 @@
 #include "lib/util/base64.h"
 #include "cmdline_contexts.h"
 #include "lib/util/tevent_ntstatus.h"
+#include "lib/util/string_wrappers.h"
 
 #include <gnutls/gnutls.h>
 #include <gnutls/crypto.h>

diff --git a/source3/utils/sharesec.c b/source3/utils/sharesec.c
index 419a6411334210a4251dfedb7fa57c8f6fc706cd..97ff0cfc9c5e7923248b07934885174b10e07314 100644 (file)
--- a/source3/utils/sharesec.c
+++ b/source3/utils/sharesec.c
@@ -29,6 +29,7 @@ struct cli_state;
 #include "passdb/machine_sid.h"
 #include "util_sd.h"
 #include "cmdline_contexts.h"
+#include "lib/util/string_wrappers.h"
 
 static TALLOC_CTX *ctx;
 

diff --git a/source3/utils/smbcontrol.c b/source3/utils/smbcontrol.c
index 6836b3ad7dbed15e9d092822b44c9582e68c1cca..5232c2b59cea2f783136cc86dc6eaf518c2c34b6 100644 (file)
--- a/source3/utils/smbcontrol.c
+++ b/source3/utils/smbcontrol.c
@@ -36,6 +36,7 @@
 #include "../lib/util/pidfile.h"
 #include "serverid.h"
 #include "cmdline_contexts.h"
+#include "lib/util/string_wrappers.h"
 
 #ifdef HAVE_LIBUNWIND_H
 #include <libunwind.h>

diff --git a/source3/utils/smbpasswd.c b/source3/utils/smbpasswd.c
index 40131205265b57707ceb1fc25e97f38d848f1073..4f727202863705765fc2cf061b6eac79ad22777c 100644 (file)
--- a/source3/utils/smbpasswd.c
+++ b/source3/utils/smbpasswd.c
@@ -25,6 +25,7 @@
 #include "passdb.h"
 #include "cmdline_contexts.h"
 #include "passwd_proto.h"
+#include "lib/util/string_wrappers.h"
 
 /*
  * Next two lines needed for SunOS and don't

diff --git a/source3/utils/status.c b/source3/utils/status.c
index 36f7030e4f41bb39ab97a59d392c3d52b8e49860..1c1cc4e9e52cc6e2da20711f3eb24a68410f7c4a 100644 (file)
--- a/source3/utils/status.c
+++ b/source3/utils/status.c
@@ -50,6 +50,7 @@
 #include "smbd/notifyd/notifyd.h"
 #include "cmdline_contexts.h"
 #include "locking/leases_db.h"
+#include "lib/util/string_wrappers.h"
 
 #define SMB_MAXPIDS            2048
 static uid_t           Ucrit_uid = 0;               /* added by OH */

diff --git a/source3/winbindd/idmap_autorid.c b/source3/winbindd/idmap_autorid.c
index 1d0f0fafb82d78399d275220c8fc8f4c96d06f86..c84e70db841afeb6f8cbabc5e553d7117ecfe915 100644 (file)
--- a/source3/winbindd/idmap_autorid.c
+++ b/source3/winbindd/idmap_autorid.c
@@ -80,6 +80,7 @@
 #include "../libcli/security/dom_sid.h"
 #include "libsmb/samlogon_cache.h"
 #include "passdb/machine_sid.h"
+#include "lib/util/string_wrappers.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_IDMAP

diff --git a/source3/winbindd/idmap_autorid_tdb.c b/source3/winbindd/idmap_autorid_tdb.c
index a95702e619e15aa25748ef8bd383791ba021d542..24cf380945d6db774815e3439122e99882ce6da2 100644 (file)
--- a/source3/winbindd/idmap_autorid_tdb.c
+++ b/source3/winbindd/idmap_autorid_tdb.c
@@ -25,6 +25,7 @@
 
 #include "idmap_autorid_tdb.h"
 #include "../libcli/security/dom_sid.h"
+#include "lib/util/string_wrappers.h"
 
 /**
  * Build the database keystring for getting a range

diff --git a/source3/winbindd/idmap_tdb.c b/source3/winbindd/idmap_tdb.c
index c3215c4dd9b0f4f29db3cf6d385536a134e7e78a..766d7f6796262b3af97becce2b7b141d79f5a2e1 100644 (file)
--- a/source3/winbindd/idmap_tdb.c
+++ b/source3/winbindd/idmap_tdb.c
@@ -33,6 +33,7 @@
 #include "dbwrap/dbwrap_open.h"
 #include "../libcli/security/security.h"
 #include "util_tdb.h"
+#include "lib/util/string_wrappers.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_IDMAP

diff --git a/source3/winbindd/wb_getpwsid.c b/source3/winbindd/wb_getpwsid.c
index 8dc09eb513d3915be70d912da740a2a0d9c01ddc..fb0351ec20101210b1f0be812cf35432af440881 100644 (file)
--- a/source3/winbindd/wb_getpwsid.c
+++ b/source3/winbindd/wb_getpwsid.c
@@ -21,6 +21,7 @@
 #include "winbindd.h"
 #include "librpc/gen_ndr/ndr_winbind_c.h"
 #include "../libcli/security/security.h"
+#include "lib/util/string_wrappers.h"
 
 struct wb_getpwsid_state {
        struct tevent_context *ev;

diff --git a/source3/winbindd/winbindd_cache.c b/source3/winbindd/winbindd_cache.c
index 63368fd18217939433c11c3726cf7592cb5a2ece..201bb34b98a8da548f85d31e3086a0bd31aaf8b1 100644 (file)
--- a/source3/winbindd/winbindd_cache.c
+++ b/source3/winbindd/winbindd_cache.c
@@ -36,6 +36,7 @@
 #include "util_tdb.h"
 #include "libsmb/samlogon_cache.h"
 #include "lib/namemap_cache.h"
+#include "lib/util/string_wrappers.h"
 
 #include "lib/crypto/gnutls_helpers.h"
 #include <gnutls/crypto.h>

diff --git a/source3/winbindd/winbindd_cm.c b/source3/winbindd/winbindd_cm.c
index 5fb22d7e9c8a6faf71db1f64123d0229905a36f3..854c227ad9d59327a847759babf3d5892cb35e12 100644 (file)
--- a/source3/winbindd/winbindd_cm.c
+++ b/source3/winbindd/winbindd_cm.c
@@ -85,6 +85,7 @@
 #include "auth/credentials/credentials.h"
 #include "lib/param/param.h"
 #include "lib/gencache.h"
+#include "lib/util/string_wrappers.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_WINBIND

diff --git a/source3/winbindd/winbindd_domain_info.c b/source3/winbindd/winbindd_domain_info.c
index 7a5d9eb38702e34487dee966d5f1a85548997ef4..5376a86704e4d42e038bc3b010629a1c75401e27 100644 (file)
--- a/source3/winbindd/winbindd_domain_info.c
+++ b/source3/winbindd/winbindd_domain_info.c
@@ -19,6 +19,7 @@
 
 #include "includes.h"
 #include "winbindd.h"
+#include "lib/util/string_wrappers.h"
 
 struct winbindd_domain_info_state {
        struct winbindd_domain *domain;

diff --git a/source3/winbindd/winbindd_dsgetdcname.c b/source3/winbindd/winbindd_dsgetdcname.c
index fd9270f106c0a66af516265da89532f8e1c81923..e3640487346ecff5bb3a4f8014f1cf83a4fbb066 100644 (file)
--- a/source3/winbindd/winbindd_dsgetdcname.c
+++ b/source3/winbindd/winbindd_dsgetdcname.c
@@ -20,6 +20,7 @@
 #include "includes.h"
 #include "winbindd.h"
 #include "librpc/gen_ndr/ndr_winbind_c.h"
+#include "lib/util/string_wrappers.h"
 
 struct winbindd_dsgetdcname_state {
        struct GUID guid;

diff --git a/source3/winbindd/winbindd_dual.c b/source3/winbindd/winbindd_dual.c
index 47efe988d6520e70c311df8592637edb360d636f..0187d232640371e11560d2100186d8189fbc9083 100644 (file)
--- a/source3/winbindd/winbindd_dual.c
+++ b/source3/winbindd/winbindd_dual.c
@@ -41,6 +41,7 @@
 #include "lib/util/sys_rw.h"
 #include "lib/util/sys_rw_data.h"
 #include "passdb.h"
+#include "lib/util/string_wrappers.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_WINBIND

diff --git a/source3/winbindd/winbindd_getdcname.c b/source3/winbindd/winbindd_getdcname.c
index f6b62757527aa4fad8a48313b2107949b82817d3..8a6b4ebd32fa0ddee1be89196ec22336af22526c 100644 (file)
--- a/source3/winbindd/winbindd_getdcname.c
+++ b/source3/winbindd/winbindd_getdcname.c
@@ -20,6 +20,7 @@
 #include "includes.h"
 #include "winbindd.h"
 #include "librpc/gen_ndr/ndr_winbind_c.h"
+#include "lib/util/string_wrappers.h"
 
 struct winbindd_getdcname_state {
        struct netr_DsRGetDCNameInfo *dcinfo;

diff --git a/source3/winbindd/winbindd_getgrnam.c b/source3/winbindd/winbindd_getgrnam.c
index d43fc3042b55a4d21ef274b593ed8fddb2b3f6b9..d66506518e89d496a2df30c16a51ac374286208e 100644 (file)
--- a/source3/winbindd/winbindd_getgrnam.c
+++ b/source3/winbindd/winbindd_getgrnam.c
@@ -20,6 +20,7 @@
 #include "includes.h"
 #include "winbindd.h"
 #include "libcli/security/dom_sid.h"
+#include "lib/util/string_wrappers.h"
 
 struct winbindd_getgrnam_state {
        struct tevent_context *ev;

diff --git a/source3/winbindd/winbindd_lookuprids.c b/source3/winbindd/winbindd_lookuprids.c
index b01e0e5877d70798b7756c5a2b96adc5853f7400..fc8fa46f4d3607fd6ada5ce42ad5810be0cf6298 100644 (file)
--- a/source3/winbindd/winbindd_lookuprids.c
+++ b/source3/winbindd/winbindd_lookuprids.c
@@ -22,6 +22,7 @@
 #include "librpc/gen_ndr/ndr_winbind_c.h"
 #include "../libcli/security/security.h"
 #include "lib/util/smb_strtox.h"
+#include "lib/util/string_wrappers.h"
 
 struct winbindd_lookuprids_state {
        struct tevent_context *ev;

diff --git a/source3/winbindd/winbindd_lookupsid.c b/source3/winbindd/winbindd_lookupsid.c
index e1e35232c2ee6f3861df71ee861590ef0d49e4f1..e20966b52b693e8eca5736c2d9072e3e5ba6717f 100644 (file)
--- a/source3/winbindd/winbindd_lookupsid.c
+++ b/source3/winbindd/winbindd_lookupsid.c
@@ -20,6 +20,7 @@
 #include "includes.h"
 #include "winbindd.h"
 #include "../libcli/security/security.h"
+#include "lib/util/string_wrappers.h"
 
 struct winbindd_lookupsid_state {
        struct dom_sid sid;

diff --git a/source3/winbindd/winbindd_misc.c b/source3/winbindd/winbindd_misc.c
index d27ed76e81e78ecf6bc071ed965c3b4aa315c0b0..451ad6aee142b89565d262842803298ba51f28d1 100644 (file)
--- a/source3/winbindd/winbindd_misc.c
+++ b/source3/winbindd/winbindd_misc.c
@@ -23,6 +23,7 @@
 #include "includes.h"
 #include "winbindd.h"
 #include "libcli/security/dom_sid.h"
+#include "lib/util/string_wrappers.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_WINBIND

diff --git a/source3/winbindd/winbindd_pam.c b/source3/winbindd/winbindd_pam.c
index b5850a33b0f074fea0b1e1abedb33f07870611a6..bc11247e581ab75378d020733bca377b8b46bd55 100644 (file)
--- a/source3/winbindd/winbindd_pam.c
+++ b/source3/winbindd/winbindd_pam.c
@@ -46,6 +46,7 @@
 #include "rpc_client/util_netlogon.h"
 #include "param/param.h"
 #include "messaging/messaging.h"
+#include "lib/util/string_wrappers.h"
 #include "lib/crypto/gnutls_helpers.h"
 
 #include "lib/crypto/gnutls_helpers.h"

diff --git a/source3/winbindd/winbindd_pam_auth.c b/source3/winbindd/winbindd_pam_auth.c
index e3c18f9525c955da02bc6627b35bc46e0fdc81d0..6ad546a6e89df4c1a7c5d1e4568c1f37013d4ad4 100644 (file)
--- a/source3/winbindd/winbindd_pam_auth.c
+++ b/source3/winbindd/winbindd_pam_auth.c
@@ -20,6 +20,7 @@
 #include "includes.h"
 #include "winbindd.h"
 #include "libcli/security/dom_sid.h"
+#include "lib/util/string_wrappers.h"
 
 struct winbindd_pam_auth_state {
        struct winbindd_request *request;

diff --git a/source3/winbindd/winbindd_pam_auth_crap.c b/source3/winbindd/winbindd_pam_auth_crap.c
index b7912db43df2ec47405ced20375c0e88c04c1673..e172ef8b52672cdbd8420a920e5fc84d21ee480c 100644 (file)
--- a/source3/winbindd/winbindd_pam_auth_crap.c
+++ b/source3/winbindd/winbindd_pam_auth_crap.c
@@ -21,6 +21,7 @@
 #include "winbindd.h"
 #include "rpc_client/util_netlogon.h"
 #include "libcli/security/dom_sid.h"
+#include "lib/util/string_wrappers.h"
 
 struct winbindd_pam_auth_crap_state {
        struct winbindd_response *response;

diff --git a/source3/winbindd/winbindd_pam_chauthtok.c b/source3/winbindd/winbindd_pam_chauthtok.c
index c802649497d6fcbab7791c46ae227bbc153bd9f5..3a61ba30f4c17cae62e001ec7d6324f94f2b60b4 100644 (file)
--- a/source3/winbindd/winbindd_pam_chauthtok.c
+++ b/source3/winbindd/winbindd_pam_chauthtok.c
@@ -19,6 +19,7 @@
 
 #include "includes.h"
 #include "winbindd.h"
+#include "lib/util/string_wrappers.h"
 
 struct winbindd_pam_chauthtok_state {
        struct winbindd_request *request;

diff --git a/source3/winbindd/winbindd_util.c b/source3/winbindd/winbindd_util.c
index 6cebc5b12c57c3e6a40736ed342f80dc1a554f5b..4b595d03417b2dca8e32bb4378e21e0e4e8625f6 100644 (file)
--- a/source3/winbindd/winbindd_util.c
+++ b/source3/winbindd/winbindd_util.c
@@ -34,6 +34,7 @@
 #include "auth/credentials/credentials.h"
 #include "libsmb/samlogon_cache.h"
 #include "lib/util/smb_strtox.h"
+#include "lib/util/string_wrappers.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_WINBIND

diff --git a/source3/winbindd/winbindd_wins_byip.c b/source3/winbindd/winbindd_wins_byip.c
index 4d3dddf08649e3eb000a53056278b5e4dcb441c7..14376b8e5add3ce0733bedc2f4d99dfed6dc1c2a 100644 (file)
--- a/source3/winbindd/winbindd_wins_byip.c
+++ b/source3/winbindd/winbindd_wins_byip.c
@@ -22,6 +22,7 @@
 #include "libsmb/namequery.h"
 #include "librpc/gen_ndr/ndr_winbind_c.h"
 #include "libsmb/nmblib.h"
+#include "lib/util/string_wrappers.h"
 
 struct winbindd_wins_byip_state {
        struct nmb_name star;

diff --git a/source4/torture/winbind/struct_based.c b/source4/torture/winbind/struct_based.c
index 9745b621ca96d92cc2d76013b12d05e9eda22eef..90c70c61069c3819793773036530d575309d2620 100644 (file)
--- a/source4/torture/winbind/struct_based.c
+++ b/source4/torture/winbind/struct_based.c
@@ -26,6 +26,7 @@
 #include "param/param.h"
 #include "../libcli/auth/pam_errors.h"
 #include "torture/winbind/proto.h"
+#include "lib/util/string_wrappers.h"
 
 #define DO_STRUCT_REQ_REP_EXT(op,req,rep,expected,strict,warnaction,cmt) do { \
        NSS_STATUS __got, __expected = (expected); \

diff --git a/testsuite/smbd/se_access_check_utils.c b/testsuite/smbd/se_access_check_utils.c
index cba2ca50125aa39c750dfb3b13717c225da8d6cc..bd20a7b2e0f305cea5a18050c564a1f6ad12f143 100644 (file)
--- a/testsuite/smbd/se_access_check_utils.c
+++ b/testsuite/smbd/se_access_check_utils.c
@@ -20,6 +20,7 @@
 
 #include "includes.h"
 #include "se_access_check_utils.h"
+#include "lib/util/string_wrappers.h"
 
 void char_to_sid(struct dom_sid *sid, char *sid_str)
 {