diff options
| author | Matthew DeVore <matvore@google.com> | 2020-08-07 13:27:39 -0700 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2020-08-28 02:18:40 +0000 |
| commit | 232054c09b1932b3940f08aa818703b51d29d968 (patch) | |
| tree | 05e50eab4cb37908c92857e9bd1a9e60a9d089ad /librpc | |
| parent | c2ac923c6a5d089fe110eb3eb6cf78298b46992d (diff) | |
| download | samba-232054c09b1932b3940f08aa818703b51d29d968.tar.gz | |
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
Diffstat (limited to 'librpc')
| -rw-r--r-- | librpc/rpc/dcerpc_util.c | 2 | ||||
| -rw-r--r-- | librpc/rpc/dcesrv_core.c | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/librpc/rpc/dcerpc_util.c b/librpc/rpc/dcerpc_util.c index 3d622b2be49..42e8e611019 100644 --- a/librpc/rpc/dcerpc_util.c +++ b/librpc/rpc/dcerpc_util.c @@ -33,6 +33,8 @@ #include "lib/crypto/gnutls_helpers.h" #include <gnutls/crypto.h> +#undef strncasecmp + /* we need to be able to get/set the fragment length without doing a full decode */ void dcerpc_set_frag_length(DATA_BLOB *blob, uint16_t v) diff --git a/librpc/rpc/dcesrv_core.c b/librpc/rpc/dcesrv_core.c index 88838121f2f..a12bf134077 100644 --- a/librpc/rpc/dcesrv_core.c +++ b/librpc/rpc/dcesrv_core.c @@ -37,6 +37,8 @@ #undef DBGC_CLASS #define DBGC_CLASS DBGC_RPC_SRV +#undef strcasecmp + static NTSTATUS dcesrv_negotiate_contexts(struct dcesrv_call_state *call, const struct dcerpc_bind *b, struct dcerpc_ack_ctx *ack_ctx_list); |