lib/util: remove extra safe_string.h file

lib/util/safe_string.h is similar to source3/include/safe_string.h, but
the former has fewer checks. It is missing bcopy, strcasecmp, and
strncasecmp.

Add the missing elements to lib/util/safe_string.h remove the other
safe_string.h which is in the source3-specific path. To accomodate
existing uses of str(n?)casecmp, add #undef lines to source files where
they are used.

Signed-off-by: Matthew DeVore <matvore@google.com>
Reviewed-by: David Mulder <dmulder@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>

Autobuild-User(master): Jeremy Allison <jra@samba.org>
Autobuild-Date(master): Fri Aug 28 02:18:40 UTC 2020 on sn-devel-184

11 files changed, 22 insertions, 0 deletions

diff --git a/source4/rpc_server/backupkey/dcesrv_backupkey.c b/source4/rpc_server/backupkey/dcesrv_backupkey.c
index 36f5e5823eb..181f95a5918 100644
--- a/source4/rpc_server/backupkey/dcesrv_backupkey.c
+++ b/source4/rpc_server/backupkey/dcesrv_backupkey.c
@@ -44,6 +44,8 @@
 
 #include "lib/crypto/gnutls_helpers.h"
 
+#undef strncasecmp
+
 #define DCESRV_INTERFACE_BACKUPKEY_BIND(context, iface) \
 	dcesrv_interface_backupkey_bind(context, iface)
 static NTSTATUS dcesrv_interface_backupkey_bind(struct dcesrv_connection_context *context,
diff --git a/source4/rpc_server/common/share_info.c b/source4/rpc_server/common/share_info.c
index 34330b92ca1..d7ed5ee4241 100644
--- a/source4/rpc_server/common/share_info.c
+++ b/source4/rpc_server/common/share_info.c
@@ -25,6 +25,8 @@
 #include "rpc_server/dcerpc_server.h"
 #include "rpc_server/common/share.h"
 
+#undef strcasecmp
+
 /* 
     Here are common server info functions used by some dcerpc server interfaces
 */
diff --git a/source4/rpc_server/dnsserver/dcerpc_dnsserver.c b/source4/rpc_server/dnsserver/dcerpc_dnsserver.c
index 88efc01f154..a5948c7969b 100644
--- a/source4/rpc_server/dnsserver/dcerpc_dnsserver.c
+++ b/source4/rpc_server/dnsserver/dcerpc_dnsserver.c
@@ -28,6 +28,8 @@
 #include "dns_server/dnsserver_common.h"
 #include "dnsserver.h"
 
+#undef strcasecmp
+
 #define DCESRV_INTERFACE_DNSSERVER_BIND(context, iface) \
 	dcesrv_interface_dnsserver_bind(context, iface)
 static NTSTATUS dcesrv_interface_dnsserver_bind(struct dcesrv_connection_context *context,
diff --git a/source4/rpc_server/dnsserver/dnsdata.c b/source4/rpc_server/dnsserver/dnsdata.c
index 47d6f5d5c88..31d0233cf52 100644
--- a/source4/rpc_server/dnsserver/dnsdata.c
+++ b/source4/rpc_server/dnsserver/dnsdata.c
@@ -26,6 +26,7 @@
 #include "librpc/gen_ndr/ndr_dnsp.h"
 #include "librpc/gen_ndr/ndr_dnsserver.h"
 
+#undef strcasecmp
 
 struct IP4_ARRAY *ip4_array_copy(TALLOC_CTX *mem_ctx, struct IP4_ARRAY *ip4)
 {
diff --git a/source4/rpc_server/dnsserver/dnsdb.c b/source4/rpc_server/dnsserver/dnsdb.c
index 798c869efe5..5ac11aea270 100644
--- a/source4/rpc_server/dnsserver/dnsdb.c
+++ b/source4/rpc_server/dnsserver/dnsdb.c
@@ -29,6 +29,8 @@
 #include "libcli/security/security.h"
 #include "dsdb/common/util.h"
 
+#undef strcasecmp
+
 /* There are only 2 fixed partitions for DNS */
 struct dnsserver_partition *dnsserver_db_enumerate_partitions(TALLOC_CTX *mem_ctx,
 							struct dnsserver_serverinfo *serverinfo,
diff --git a/source4/rpc_server/dnsserver/dnsutils.c b/source4/rpc_server/dnsserver/dnsutils.c
index 880e120c39a..94407be0dcf 100644
--- a/source4/rpc_server/dnsserver/dnsutils.c
+++ b/source4/rpc_server/dnsserver/dnsutils.c
@@ -28,6 +28,8 @@
 #include "lib/util/util_net.h"
 #include "dnsserver_common.h"
 
+#undef strcasecmp
+
 static struct DNS_ADDR_ARRAY *fill_dns_addr_array(TALLOC_CTX *mem_ctx,
 					   struct loadparm_context *lp_ctx,
 					   bool listen_only)
diff --git a/source4/rpc_server/drsuapi/writespn.c b/source4/rpc_server/drsuapi/writespn.c
index c6faea39e9f..9e4b533365a 100644
--- a/source4/rpc_server/drsuapi/writespn.c
+++ b/source4/rpc_server/drsuapi/writespn.c
@@ -35,6 +35,8 @@
 #undef DBGC_CLASS
 #define DBGC_CLASS            DBGC_DRS_REPL
 
+#undef strcasecmp
+
 /*
   check that the SPN update should be allowed as an override
   via sam_ctx_system
diff --git a/source4/rpc_server/lsa/dcesrv_lsa.c b/source4/rpc_server/lsa/dcesrv_lsa.c
index acd37131d79..ebe259ff81e 100644
--- a/source4/rpc_server/lsa/dcesrv_lsa.c
+++ b/source4/rpc_server/lsa/dcesrv_lsa.c
@@ -39,6 +39,8 @@
 #include <gnutls/gnutls.h>
 #include <gnutls/crypto.h>
 
+#undef strcasecmp
+
 #define DCESRV_INTERFACE_LSARPC_BIND(context, iface) \
        dcesrv_interface_lsarpc_bind(context, iface)
 static NTSTATUS dcesrv_interface_lsarpc_bind(struct dcesrv_connection_context *context,
diff --git a/source4/rpc_server/netlogon/dcerpc_netlogon.c b/source4/rpc_server/netlogon/dcerpc_netlogon.c
index 0ab55afeab0..0351e2d286c 100644
--- a/source4/rpc_server/netlogon/dcerpc_netlogon.c
+++ b/source4/rpc_server/netlogon/dcerpc_netlogon.c
@@ -48,6 +48,8 @@
 #define DCESRV_INTERFACE_NETLOGON_BIND(context, iface) \
        dcesrv_interface_netlogon_bind(context, iface)
 
+#undef strcasecmp
+
 /*
  * This #define allows the netlogon interface to accept invalid
  * association groups, because association groups are to coordinate
diff --git a/source4/rpc_server/samr/dcesrv_samr.c b/source4/rpc_server/samr/dcesrv_samr.c
index 70f914bf14c..cda887d45ee 100644
--- a/source4/rpc_server/samr/dcesrv_samr.c
+++ b/source4/rpc_server/samr/dcesrv_samr.c
@@ -41,6 +41,8 @@
 #include "lib/util/tsort.h"
 #include "libds/common/flag_mapping.h"
 
+#undef strcasecmp
+
 #define DCESRV_INTERFACE_SAMR_BIND(context, iface) \
        dcesrv_interface_samr_bind(context, iface)
 static NTSTATUS dcesrv_interface_samr_bind(struct dcesrv_connection_context *context,
diff --git a/source4/rpc_server/srvsvc/dcesrv_srvsvc.c b/source4/rpc_server/srvsvc/dcesrv_srvsvc.c
index 7294c90a328..c41fbc7573f 100644
--- a/source4/rpc_server/srvsvc/dcesrv_srvsvc.c
+++ b/source4/rpc_server/srvsvc/dcesrv_srvsvc.c
@@ -31,6 +31,9 @@
 #include "rpc_server/srvsvc/proto.h"
 #include "param/param.h"
 
+#undef strcasecmp
+#undef strncasecmp
+
 #define SRVSVC_CHECK_ADMIN_ACCESS do { \
 	struct auth_session_info *si = dcesrv_call_session_info(dce_call); \
 	struct security_token *t = si->security_token; \