summaryrefslogtreecommitdiff
path: root/lib/ldb
diff options
context:
space:
mode:
authorMatthew DeVore <matvore@google.com>2020-08-07 13:27:39 -0700
committerJeremy Allison <jra@samba.org>2020-08-28 02:18:40 +0000
commit232054c09b1932b3940f08aa818703b51d29d968 (patch)
tree05e50eab4cb37908c92857e9bd1a9e60a9d089ad /lib/ldb
parentc2ac923c6a5d089fe110eb3eb6cf78298b46992d (diff)
downloadsamba-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 'lib/ldb')
-rw-r--r--lib/ldb/include/ldb.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/ldb/include/ldb.h b/lib/ldb/include/ldb.h
index 7f53e6420e1..08e2096b914 100644
--- a/lib/ldb/include/ldb.h
+++ b/lib/ldb/include/ldb.h
@@ -1944,6 +1944,7 @@ int ldb_dn_update_components(struct ldb_dn *dn, const struct ldb_dn *ref_dn);
strcasecmp and toupper here is ok.
return 0 for match
*/
+#undef strcasecmp
#define ldb_attr_cmp(a, b) strcasecmp(a, b)
char *ldb_attr_casefold(TALLOC_CTX *mem_ctx, const char *s);
int ldb_attr_dn(const char *attr);