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>

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;
 

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;

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

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
 

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

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

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

source3/include/safe_string.h

@@ -62,6 +62,4 @@
 
 #endif /* !_SPLINT_ */
 
-#include "lib/util/string_wrappers.h"
-
 #endif

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

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_"
 

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

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

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,

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>

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

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

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

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

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
 

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;

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 ...

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.

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>

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

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.

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;

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 ?

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;

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

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

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;
 

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

source3/nmbd/nmbd_browserdb.c

@@ -28,6 +28,7 @@
 
 #include "includes.h"
 #include "nmbd/nmbd.h"
+#include "lib/util/string_wrappers.h"
 
 /* -------------------------------------------------------------------------- **
  * Variables...

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;

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;

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;
 

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);

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;

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;

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;
 

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;

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;
 

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>

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

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

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

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

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

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

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)

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"};

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;
 

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

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

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>

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>

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;
 

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;
 

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

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) \

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) \
 { \

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

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.

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,

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

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:

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

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)
 {

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.

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

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
 

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;

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;
 

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;

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>

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)
 {

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;

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;

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>

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.

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);

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[]= {

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

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;

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

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;

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;

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>

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;
 

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>

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

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

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

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

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

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;

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>

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

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;

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;