diff options
author | Matthew DeVore <matvore@google.com> | 2020-08-07 11:17:34 -0700 |
---|---|---|
committer | Jeremy Allison <jra@samba.org> | 2020-08-28 00:56:34 +0000 |
commit | c2ac923c6a5d089fe110eb3eb6cf78298b46992d (patch) | |
tree | e5e98fb3954d0dbf5b34140aab19ad7f576d7287 /source3/passdb | |
parent | 1fde7db3bc51b1f9a13388315b09ab3ce7f20b80 (diff) | |
download | samba-c2ac923c6a5d089fe110eb3eb6cf78298b46992d.tar.gz |
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>
Diffstat (limited to 'source3/passdb')
-rw-r--r-- | source3/passdb/machine_account_secrets.c | 1 | ||||
-rw-r--r-- | source3/passdb/passdb.c | 1 | ||||
-rw-r--r-- | source3/passdb/pdb_interface.c | 1 | ||||
-rw-r--r-- | source3/passdb/pdb_ldap.c | 1 | ||||
-rw-r--r-- | source3/passdb/pdb_smbpasswd.c | 1 | ||||
-rw-r--r-- | source3/passdb/pdb_tdb.c | 1 | ||||
-rw-r--r-- | source3/passdb/py_passdb.c | 1 |
7 files changed, 7 insertions, 0 deletions
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) |