From da662b82b87cdbe07762974b1f9e825ef15951bd Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Fri, 13 May 2011 20:23:36 +0200 Subject: s3-lib Replace StrnCaseCmp() with strncasecmp_m() strncasecmp_m() never needs to call to talloc, and via next_codepoint() still has an ASCII fast-path bypassing iconv() calls. Andrew Bartlett --- source3/winbindd/idmap_adex/cell_util.c | 4 ++-- source3/winbindd/idmap_adex/provider_unified.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'source3/winbindd/idmap_adex') diff --git a/source3/winbindd/idmap_adex/cell_util.c b/source3/winbindd/idmap_adex/cell_util.c index c82407c0f4..9c50f73c41 100644 --- a/source3/winbindd/idmap_adex/cell_util.c +++ b/source3/winbindd/idmap_adex/cell_util.c @@ -38,7 +38,7 @@ for (i = 0; i < num_lines; i++) { /* make sure to avoid substring matches like uid and uidNumber */ - if ((StrnCaseCmp(list[i], substr, cmplen) == 0) && + if ((strncasecmp_m(list[i], substr, cmplen) == 0) && (list[i][cmplen] == '=')) { /* Don't return an empty string */ if (list[i][cmplen + 1] != '\0') @@ -230,7 +230,7 @@ done: while (next_token_talloc(frame, &tmp_dn, &buffer, ",")) { /* skip everything up the where DC=... begins */ - if (StrnCaseCmp(buffer, "DC=", 3) != 0) + if (strncasecmp_m(buffer, "DC=", 3) != 0) continue; if (!domain) { diff --git a/source3/winbindd/idmap_adex/provider_unified.c b/source3/winbindd/idmap_adex/provider_unified.c index 03f9d33ba3..9e271a0db9 100644 --- a/source3/winbindd/idmap_adex/provider_unified.c +++ b/source3/winbindd/idmap_adex/provider_unified.c @@ -310,7 +310,7 @@ static bool check_forest_scope(const char *dn) } q++; - if (StrnCaseCmp(q, "dc=", 3) != 0) { + if (strncasecmp_m(q, "dc=", 3) != 0) { nt_status = NT_STATUS_OBJECT_PATH_NOT_FOUND; BAIL_ON_NTSTATUS_ERROR(nt_status); } -- cgit