diff options
114 files changed, 113 insertions, 2 deletions
diff --git a/libgpo/gpext/gpext.c b/libgpo/gpext/gpext.c index 73bebf1879f..45c89707720 100644 --- 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 28637619226..3cd94706551 100644 --- 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 39e3878b396..6cd795ea72e 100644 --- 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 371ab78d2f8..4f79cc67a1d 100644 --- 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 f16b3cc2934..046b9793e33 100644 --- 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 751cee61ce1..c3c3d82c77d 100644 --- 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 30287ffd253..3d467498920 100644 --- 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 03878b48f51..4609e3a45fd 100644 --- 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 d5a60e73403..a4b8861f466 100644 --- 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 19412133342..9900aa6f93b 100644 --- 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 25486afcbd4..42022d78ab9 100644 --- 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 833af10b6f0..e359ef89494 100644 --- 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 f69d9c3bf22..280285e25d2 100644 --- 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 a51c4aaf514..62584bc7ca2 100644 --- 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 39083b15438..bcf152b22cf 100644 --- 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 57cd76c108d..806f860136b 100644 --- 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 23796a2c5f4..2f28a4de6fb 100644 --- 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 ac668bc3b47..4472a9c4b5f 100644 --- 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 d3db3fe03e1..e1319fc8329 100644 --- 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 8bf6629b9a1..2b8f9a0e742 100644 --- 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 bed507626c1..ec0b1efa8ce 100644 --- 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 c7888e9b387..309a108a72c 100644 --- 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 a52fe3162b1..3b47fd73323 100644 --- 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 b4ebc90bf49..1f1e3feeadd 100644 --- 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 d1b6548eb90..c5aa1b571f1 100644 --- 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 57ef58ec12e..242ec2915ee 100644 --- 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 f63dde61603..77a7ce30e35 100644 --- 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 a5e691a1c86..ff009092bbf 100644 --- 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 d3ecfef46f1..c4aa200cc7e 100644 --- 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 cf5e1cbc296..30f568c5e80 100644 --- 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 9d89bfd396a..82f60f8a68b 100644 --- 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 80c699f2d91..40f8b1b76f0 100644 --- 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 b883f569c19..b5fdbab95c6 100644 --- 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 6f90e613478..181787df410 100644 --- 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 16988c8aec8..41470ea314e 100644 --- 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 e8980055b19..80fb30462b0 100644 --- 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 4a23c3a42b9..ab3764790cc 100644 --- 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 be9e091f006..a1d8deec0f3 100644 --- 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 f4c852ba0b8..b7ee2830001 100644 --- 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 e7cb36a2de2..8dbc43c3504 100644 --- 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 53b4f129038..a65cbb87e0e 100644 --- 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 14bc941b872..cd97efd8273 100644 --- 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 9c2d7634d36..c218e2fc372 100644 --- 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 5cda8f065c4..d81f79c705b 100644 --- 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 8ed1bafcea3..a598d75fb04 100644 --- 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 03aa4ff8472..cdfa4903916 100644 --- 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 ba82c9833c6..e6d8a84c60f 100644 --- 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 76cfddfb195..515e5f9f84d 100644 --- 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 0f7e2a919f4..161030fed8b 100644 --- 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 70238e43d41..b9b4ae95d06 100644 --- 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 91fc2ead712..d7a63a59f27 100644 --- 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 d09c12ade77..8312b0b612d 100644 --- 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 2030c4c2395..355953fa222 100644 --- 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 0193b177aec..7db3c073a2b 100644 --- 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 b52f7e25da5..0bbd7c8eff3 100644 --- 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 f75aa0a12ac..f10dee08c4a 100644 --- 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 3c74efb9657..2798f629bcb 100644 --- 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 3fa85579f20..d54a39a9922 100644 --- 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 f0640b504d8..3a091478dec 100644 --- 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 e98401a4365..d746067d250 100644 --- 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 85062541da2..3b7abc665bd 100644 --- 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 478afc68cd1..073e51da439 100644 --- 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 51cd22d6c5a..41c760ec943 100644 --- 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 4012d6e64c9..8eef16404e0 100644 --- 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 abbec164217..31ccd28d02f 100644 --- 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 67ef60da852..cd11c270f6b 100644 --- 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 debdb8487b6..a08d3df512b 100644 --- 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 43803e721c2..b1ea0ea6a88 100644 --- 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 9550d35f341..89bec95c6cb 100644 --- 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 c2d70b32c32..6ea3ea48a59 100644 --- 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 16f8318663f..d4cc62de502 100644 --- 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 92ddb7629b9..62f60ee1fe4 100644 --- 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 9886e38b532..5832a92cdda 100644 --- 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 95e0b04b040..ac73a477a6b 100644 --- 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 a4edeefd628..d2dedd8938f 100644 --- 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 666f21a27f5..a912c4cb3b0 100644 --- 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 3d714382e1b..9bdaf2c5161 100644 --- 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 2770fffa48c..f831927dc42 100644 --- 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 b615095c7e1..3eb139d0bb4 100644 --- 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 b4da9bae556..68765a21fc8 100644 --- 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 956b6d02901..0a7c8429ff9 100644 --- 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 af035a9b52e..691ea821b5d 100644 --- 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 c37b04ebb9a..97844882fda 100644 --- 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 35111a7931f..a0fbc51b955 100644 --- 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 10d7e342253..6a2c6c861f9 100644 --- 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 637ef801352..50db771deb3 100644 --- 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 2f50c5c8f5a..388bb9b8a64 100644 --- 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 7f8d2688978..bc14d2f228f 100644 --- 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 419a6411334..97ff0cfc9c5 100644 --- 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 6836b3ad7db..5232c2b59ce 100644 --- 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 40131205265..4f727202863 100644 --- 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 36f7030e4f4..1c1cc4e9e52 100644 --- 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 1d0f0fafb82..c84e70db841 100644 --- 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 a95702e619e..24cf380945d 100644 --- 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 c3215c4dd9b..766d7f67962 100644 --- 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 8dc09eb513d..fb0351ec201 100644 --- 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 63368fd1821..201bb34b98a 100644 --- 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 5fb22d7e9c8..854c227ad9d 100644 --- 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 7a5d9eb3870..5376a86704e 100644 --- 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 fd9270f106c..e3640487346 100644 --- 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 47efe988d65..0187d232640 100644 --- 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 f6b62757527..8a6b4ebd32f 100644 --- 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 d43fc3042b5..d66506518e8 100644 --- 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 b01e0e5877d..fc8fa46f4d3 100644 --- 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 e1e35232c2e..e20966b52b6 100644 --- 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 d27ed76e81e..451ad6aee14 100644 --- 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 b5850a33b0f..bc11247e581 100644 --- 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 e3c18f9525c..6ad546a6e89 100644 --- 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 b7912db43df..e172ef8b526 100644 --- 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 c802649497d..3a61ba30f4c 100644 --- 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 6cebc5b12c5..4b595d03417 100644 --- 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 4d3dddf0864..14376b8e5ad 100644 --- 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 9745b621ca9..90c70c61069 100644 --- 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 cba2ca50125..bd20a7b2e0f 100644 --- 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) { |