summaryrefslogtreecommitdiff
path: root/nsswitch
diff options
context:
space:
mode:
authorMatthew DeVore <matvore@google.com>2020-08-07 11:17:34 -0700
committerJeremy Allison <jra@samba.org>2020-08-28 00:56:34 +0000
commitc2ac923c6a5d089fe110eb3eb6cf78298b46992d (patch)
treee5e98fb3954d0dbf5b34140aab19ad7f576d7287 /nsswitch
parent1fde7db3bc51b1f9a13388315b09ab3ce7f20b80 (diff)
downloadsamba-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 'nsswitch')
-rw-r--r--nsswitch/wbinfo.c1
-rw-r--r--nsswitch/wins.c1
2 files changed, 2 insertions, 0 deletions
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