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 <[email protected]> Reviewed-by: David Mulder <[email protected]> Reviewed-by: Jeremy Allison <[email protected]>
mbarden · Aug 28, 2020 · c2ac923 · c2ac923
1 parent 1fde7db
commit c2ac923
Show file tree

Hide file tree

Showing 114 changed files with 113 additions and 2 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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)
Original file line number	Diff line number	Diff line change
Expand Up		@@ -62,6 +62,4 @@

		#endif /* !_SPLINT_ */

		#include "lib/util/string_wrappers.h"

		#endif