r9792: Rename StrCaseCmp -> strcasecmp_m. All these years I was thinking

StrCaseCmp was sys_strcasecmp, while it is in fact strcasecmp_m!

diff --git a/source/auth/kerberos/clikrb5.c b/source/auth/kerberos/clikrb5.c
index 3f4f8219589c20f56e678d9fd91e08b6680c0c60..40c1e254f8ab6139828958b81a2f1f9ce9d62a1c 100644 (file)
--- a/source/auth/kerberos/clikrb5.c
+++ b/source/auth/kerberos/clikrb5.c
@@ -253,7 +253,7 @@ static BOOL ads_cleanup_expired_creds(krb5_context context,
           use memory ccaches, and a FILE one probably means that
           we're using creds obtained outside of our exectuable
        */
           use memory ccaches, and a FILE one probably means that
           we're using creds obtained outside of our exectuable
        */

-       if (StrCaseCmp(krb5_cc_get_type(context, ccache), "FILE") == 0) {
+       if (strcasecmp_m(krb5_cc_get_type(context, ccache), "FILE") == 0) {

                DEBUG(5, ("ads_cleanup_expired_creds: We do not remove creds from a FILE ccache\n"));
                return False;
        }
                DEBUG(5, ("ads_cleanup_expired_creds: We do not remove creds from a FILE ccache\n"));
                return False;
        }

diff --git a/source/kdc/hdb-ldb.c b/source/kdc/hdb-ldb.c
index f138373cc3ff3dc3a6cecf4fd23495bc10e36af7..ccdd64f40b248c68e1bdc9f6580eacbf08d4a90b 100644 (file)
--- a/source/kdc/hdb-ldb.c
+++ b/source/kdc/hdb-ldb.c
@@ -469,7 +469,7 @@ static krb5_error_code LDB_lookup_principal(krb5_context context, struct ldb_con
 
        /* Allow host/dns.name/realm@REALM, just convert into host/dns.name@REALM */
        if (princ.name.name_string.len == 3
 
        /* Allow host/dns.name/realm@REALM, just convert into host/dns.name@REALM */
        if (princ.name.name_string.len == 3

-           && StrCaseCmp(princ.name.name_string.val[2], princ.realm) == 0) { 
+           && strcasecmp_m(princ.name.name_string.val[2], princ.realm) == 0) { 

                princ.name.name_string.len = 2;
        }
 
                princ.name.name_string.len = 2;
        }
 

diff --git a/source/lib/appweb/mpr/miniMpr.h b/source/lib/appweb/mpr/miniMpr.h
index 6fc4d50c31e69b25bcf45a443fe1d61c57deece2..0f668ab1d4eea2b18e2496735df6d85d5ea45c58 100644 (file)
--- a/source/lib/appweb/mpr/miniMpr.h
+++ b/source/lib/appweb/mpr/miniMpr.h
@@ -274,7 +274,7 @@ extern int          mprMemcpy(char *dest, int destMax, const char *src, int nbytes);
 extern void mprSetCtx(void *ctx);
 extern void *mprMemCtx(void);
 
 extern void mprSetCtx(void *ctx);
 extern void *mprMemCtx(void);
 

-#define mprStrCmpAnyCase(s1, s2) StrCaseCmp(s1, s2)
+#define mprStrCmpAnyCase(s1, s2) strcasecmp_m(s1, s2)

 
 #ifdef __cplusplus
 }
 
 #ifdef __cplusplus
 }

diff --git a/source/lib/ms_fnmatch.c b/source/lib/ms_fnmatch.c
index c405d2ff30f9ba9a962c4fdf87c1c129f2bb9741..699341bede5a386ac1f4c0786ffc19099b0e00dd 100644 (file)
--- a/source/lib/ms_fnmatch.c
+++ b/source/lib/ms_fnmatch.c
@@ -163,7 +163,7 @@ int ms_fnmatch(const char *pattern, const char *string, enum protocol_types prot
        if (strpbrk(pattern, "<>*?\"") == NULL) {
                /* this is not just an optmisation - it is essential
                   for LANMAN1 correctness */
        if (strpbrk(pattern, "<>*?\"") == NULL) {
                /* this is not just an optmisation - it is essential
                   for LANMAN1 correctness */

-               return StrCaseCmp(pattern, string);
+               return strcasecmp_m(pattern, string);

        }
 
        if (protocol <= PROTOCOL_LANMAN2) {
        }
 
        if (protocol <= PROTOCOL_LANMAN2) {

diff --git a/source/lib/samba3/samba3.c b/source/lib/samba3/samba3.c
index 4b893c585a106ab040d8dd963df7d8abd5b46eb7..56a773869355ceda9cddf5dfdece04a8ef019975 100644 (file)
--- a/source/lib/samba3/samba3.c
+++ b/source/lib/samba3/samba3.c
@@ -31,7 +31,7 @@ struct samba3_domainsecrets *samba3_find_domainsecrets(struct samba3 *db, const
        int i;
        
        for (i = 0; i < db->secrets.domain_count; i++) {
        int i;
        
        for (i = 0; i < db->secrets.domain_count; i++) {

-               if (!StrCaseCmp(db->secrets.domains[i].name, name)) 
+               if (!strcasecmp_m(db->secrets.domains[i].name, name)) 

                        return &db->secrets.domains[i];
        }
 
                        return &db->secrets.domains[i];
        }
 


@@ -42,7 +42,7 @@ struct samba3_share_info *samba3_find_share(struct samba3 *db, const char *name)
 {
        int i;
        for (i = 0; i < db->share_count; i++) {
 {
        int i;
        for (i = 0; i < db->share_count; i++) {

-               if (!StrCaseCmp(db->shares[i].name, name)) 
+               if (!strcasecmp_m(db->shares[i].name, name)) 

                        return &db->shares[i];
        }
 
                        return &db->shares[i];
        }
 


@@ -74,7 +74,7 @@ const char *samba3_get_param(struct samba3 *samba3, const char *section, const c
                return NULL;
 
        for (i = 0; i < share->parameter_count; i++) {
                return NULL;
 
        for (i = 0; i < share->parameter_count; i++) {

-               if (!StrCaseCmp(share->parameters[i].name, param))
+               if (!strcasecmp_m(share->parameters[i].name, param))

                        return share->parameters[i].value;
        }
 
                        return share->parameters[i].value;
        }
 

diff --git a/source/lib/samba3/secrets.c b/source/lib/samba3/secrets.c
index 43f0a2ec12b3aa781652ec0c961aaa2ae645cf8a..0f3cc0c581dd24590be911c5be967f336dc1cf60 100644 (file)
--- a/source/lib/samba3/secrets.c
+++ b/source/lib/samba3/secrets.c
@@ -66,7 +66,7 @@ static struct samba3_domainsecrets *secrets_find_domain(TALLOC_CTX *ctx, struct
 
        for (i = 0; i < db->domain_count; i++) 
        {
 
        for (i = 0; i < db->domain_count; i++) 
        {

-               if (!StrCaseCmp(db->domains[i].name, key)) 
+               if (!strcasecmp_m(db->domains[i].name, key)) 

                        return &db->domains[i];
        }
 
                        return &db->domains[i];
        }
 

diff --git a/source/lib/util_str.c b/source/lib/util_str.c
index a0e9da41601a4b27ce8cab3cdda0c3a2b9927e12..685cc52c65b63e1d1da2bcf0e3485145ff889993 100644 (file)
--- a/source/lib/util_str.c
+++ b/source/lib/util_str.c
@@ -80,7 +80,7 @@ BOOL next_token(const char **ptr,char *buff, const char *sep, size_t bufsize)
 /**
  Case insensitive string compararison
 **/
 /**
  Case insensitive string compararison
 **/

-int StrCaseCmp(const char *s1, const char *s2)
+int strcasecmp_m(const char *s1, const char *s2)

 {
        codepoint_t c1=0, c2=0;
        size_t size1, size2;
 {
        codepoint_t c1=0, c2=0;
        size_t size1, size2;


@@ -122,7 +122,7 @@ BOOL strequal(const char *s1, const char *s2)
        if (!s1 || !s2)
                return(False);
   
        if (!s1 || !s2)
                return(False);
   

-       return StrCaseCmp(s1,s2) == 0;
+       return strcasecmp_m(s1,s2) == 0;

 }
 
 /**
 }
 
 /**


@@ -477,7 +477,7 @@ BOOL in_list(const char *s, const char *list, BOOL casesensitive)
                        if (strcmp(tok,s) == 0)
                                return(True);
                } else {
                        if (strcmp(tok,s) == 0)
                                return(True);
                } else {

-                       if (StrCaseCmp(tok,s) == 0)
+                       if (strcasecmp_m(tok,s) == 0)

                                return(True);
                }
        }
                                return(True);
                }
        }

diff --git a/source/libads/ldap.c b/source/libads/ldap.c
index f760843b59698769da51e76fd936423d63560a5e..642e31bb961dd98dc2cb9d8e4b56a2a711acbff6 100644 (file)
--- a/source/libads/ldap.c
+++ b/source/libads/ldap.c
@@ -1206,7 +1206,7 @@ static BOOL ads_dump_field(char *field, void **values, void *data_area)
        }
 
        for (i=0; handlers[i].name; i++) {
        }
 
        for (i=0; handlers[i].name; i++) {

-               if (StrCaseCmp(handlers[i].name, field) == 0) {
+               if (strcasecmp_m(handlers[i].name, field) == 0) {

                        if (!values) /* first time, indicate string or not */
                                return handlers[i].string;
                        handlers[i].handler(field, (struct berval **) values);
                        if (!values) /* first time, indicate string or not */
                                return handlers[i].string;
                        handlers[i].handler(field, (struct berval **) values);

diff --git a/source/libads/ldap_printer.c b/source/libads/ldap_printer.c
index 7ae19219b4f1e29936514a2daa737b2787174d80..4e79f73a2854f06c51adc63bdc40432094e9143b 100644 (file)
--- a/source/libads/ldap_printer.c
+++ b/source/libads/ldap_printer.c
@@ -246,7 +246,7 @@ static void map_regval_to_ads(TALLOC_CTX *ctx, ADS_MODLIST *mods,
        int i;
 
        for (i=0; map[i].valname; i++) {
        int i;
 
        for (i=0; map[i].valname; i++) {

-               if (StrCaseCmp(map[i].valname, value->valuename) == 0) {
+               if (strcasecmp_m(map[i].valname, value->valuename) == 0) {

                        if (!map[i].fn(ctx, mods, value)) {
                                DEBUG(5, ("Add of value %s to modlist failed\n", value->valuename));
                        } else {
                        if (!map[i].fn(ctx, mods, value)) {
                                DEBUG(5, ("Add of value %s to modlist failed\n", value->valuename));
                        } else {

diff --git a/source/libnet/libnet_samdump.c b/source/libnet/libnet_samdump.c
index ecedc0264ffb38b3bcbedbadd42a74ea3b49b64c..8936407972873e2e29441fd102800a43f63f107d 100644 (file)
--- a/source/libnet/libnet_samdump.c
+++ b/source/libnet/libnet_samdump.c
@@ -184,7 +184,7 @@ static NTSTATUS libnet_SamDump_netlogon(struct libnet_context *ctx, TALLOC_CTX *
        for (t=samdump_state->trusted_domains; t; t=t->next) {
                char *secret_name = talloc_asprintf(mem_ctx, "G$$%s", t->name);
                for (s=samdump_state->secrets; s; s=s->next) {
        for (t=samdump_state->trusted_domains; t; t=t->next) {
                char *secret_name = talloc_asprintf(mem_ctx, "G$$%s", t->name);
                for (s=samdump_state->secrets; s; s=s->next) {

-                       if (StrCaseCmp(s->name, secret_name) == 0) {
+                       if (strcasecmp_m(s->name, secret_name) == 0) {

                                char *secret_string;
                                if (convert_string_talloc(mem_ctx, CH_UTF16, CH_UNIX, 
                                                          s->secret.data, s->secret.length, 
                                char *secret_string;
                                if (convert_string_talloc(mem_ctx, CH_UTF16, CH_UNIX, 
                                                          s->secret.data, s->secret.length, 

diff --git a/source/ntvfs/posix/pvfs_dirlist.c b/source/ntvfs/posix/pvfs_dirlist.c
index a055773b511716a6008d4116b982e10d7d58c190..9838072080c892c51bb3009492e1333a2ad2c43c 100644 (file)
--- a/source/ntvfs/posix/pvfs_dirlist.c
+++ b/source/ntvfs/posix/pvfs_dirlist.c
@@ -283,14 +283,14 @@ NTSTATUS pvfs_list_seek(struct pvfs_dir *dir, const char *name, uint_t *ofs)
 
        for (i=dir->name_cache_index;i>=0;i--) {
                struct name_cache_entry *e = &dir->name_cache[i];
 
        for (i=dir->name_cache_index;i>=0;i--) {
                struct name_cache_entry *e = &dir->name_cache[i];

-               if (e->name && StrCaseCmp(name, e->name) == 0) {
+               if (e->name && strcasecmp_m(name, e->name) == 0) {

                        *ofs = e->offset;
                        return NT_STATUS_OK;
                }
        }
        for (i=NAME_CACHE_SIZE-1;i>dir->name_cache_index;i--) {
                struct name_cache_entry *e = &dir->name_cache[i];
                        *ofs = e->offset;
                        return NT_STATUS_OK;
                }
        }
        for (i=NAME_CACHE_SIZE-1;i>dir->name_cache_index;i--) {
                struct name_cache_entry *e = &dir->name_cache[i];

-               if (e->name && StrCaseCmp(name, e->name) == 0) {
+               if (e->name && strcasecmp_m(name, e->name) == 0) {

                        *ofs = e->offset;
                        return NT_STATUS_OK;
                }
                        *ofs = e->offset;
                        return NT_STATUS_OK;
                }


@@ -299,7 +299,7 @@ NTSTATUS pvfs_list_seek(struct pvfs_dir *dir, const char *name, uint_t *ofs)
        rewinddir(dir->dir);
 
        while ((de = readdir(dir->dir))) {
        rewinddir(dir->dir);
 
        while ((de = readdir(dir->dir))) {

-               if (StrCaseCmp(name, de->d_name) == 0) {
+               if (strcasecmp_m(name, de->d_name) == 0) {

                        dir->offset = telldir(dir->dir) + DIR_OFFSET_BASE;
                        *ofs = dir->offset;
                        return NT_STATUS_OK;
                        dir->offset = telldir(dir->dir) + DIR_OFFSET_BASE;
                        *ofs = dir->offset;
                        return NT_STATUS_OK;

diff --git a/source/ntvfs/posix/pvfs_open.c b/source/ntvfs/posix/pvfs_open.c
index 94749600e1cc6fdb7ea69d2aa6810b18c8fab9a1..0e2a85bab1f8bdcf4891201031a793d9f6213fc2 100644 (file)
--- a/source/ntvfs/posix/pvfs_open.c
+++ b/source/ntvfs/posix/pvfs_open.c
@@ -734,7 +734,7 @@ static NTSTATUS pvfs_open_deny_dos(struct ntvfs_module_context *ntvfs,
                     (NTCREATEX_OPTIONS_PRIVATE_DENY_DOS |
                      NTCREATEX_OPTIONS_PRIVATE_DENY_FCB)) &&
                    (f2->access_mask & SEC_FILE_WRITE_DATA) &&
                     (NTCREATEX_OPTIONS_PRIVATE_DENY_DOS |
                      NTCREATEX_OPTIONS_PRIVATE_DENY_FCB)) &&
                    (f2->access_mask & SEC_FILE_WRITE_DATA) &&

-                   StrCaseCmp(f2->handle->name->original_name, 
+                   strcasecmp_m(f2->handle->name->original_name, 

                               io->generic.in.fname)==0) {
                        break;
                }
                               io->generic.in.fname)==0) {
                        break;
                }

diff --git a/source/ntvfs/posix/pvfs_qfileinfo.c b/source/ntvfs/posix/pvfs_qfileinfo.c
index 4b6afac00a8b11b3747695b4e26a2575e2097426..1f2f86e9534b80b2aba18b18e080de4a93c09d0e 100644 (file)
--- a/source/ntvfs/posix/pvfs_qfileinfo.c
+++ b/source/ntvfs/posix/pvfs_qfileinfo.c
@@ -82,7 +82,7 @@ NTSTATUS pvfs_query_ea_list(struct pvfs_state *pvfs, TALLOC_CTX *mem_ctx,
                eas->eas[i].name.s = names[i].name.s;
                eas->eas[i].value = data_blob(NULL, 0);
                for (j=0;j<ealist->num_eas;j++) {
                eas->eas[i].name.s = names[i].name.s;
                eas->eas[i].value = data_blob(NULL, 0);
                for (j=0;j<ealist->num_eas;j++) {

-                       if (StrCaseCmp(eas->eas[i].name.s, 
+                       if (strcasecmp_m(eas->eas[i].name.s, 

                                       ealist->eas[j].name) == 0) {
                                eas->eas[i].value = ealist->eas[j].value;
                                break;
                                       ealist->eas[j].name) == 0) {
                                eas->eas[i].value = ealist->eas[j].value;
                                break;

diff --git a/source/ntvfs/posix/pvfs_resolve.c b/source/ntvfs/posix/pvfs_resolve.c
index 355e82c3010e5e39baa1924e91019d650a7cef7f..b8e55c85bfc1bf855e8c69dc4be0667748207cbc 100644 (file)
--- a/source/ntvfs/posix/pvfs_resolve.c
+++ b/source/ntvfs/posix/pvfs_resolve.c
@@ -38,12 +38,12 @@ static int component_compare(struct pvfs_state *pvfs, const char *comp, const ch
 {
        int ret;
 
 {
        int ret;
 

-       ret = StrCaseCmp(comp, name);
+       ret = strcasecmp_m(comp, name);

 
        if (ret != 0) {
                char *shortname = pvfs_short_name_component(pvfs, name);
                if (shortname) {
 
        if (ret != 0) {
                char *shortname = pvfs_short_name_component(pvfs, name);
                if (shortname) {

-                       ret = StrCaseCmp(comp, shortname);
+                       ret = strcasecmp_m(comp, shortname);

                        talloc_free(shortname);
                }
        }
                        talloc_free(shortname);
                }
        }


@@ -197,7 +197,7 @@ static NTSTATUS parse_stream_name(struct pvfs_filename *name, const char *s)
                                                 strlen(name->stream_name));
                return NT_STATUS_OK;
        }
                                                 strlen(name->stream_name));
                return NT_STATUS_OK;
        }

-       if (StrCaseCmp(p, ":$DATA") != 0) {
+       if (strcasecmp_m(p, ":$DATA") != 0) {

                return NT_STATUS_OBJECT_NAME_INVALID;
        }
        *p = 0;
                return NT_STATUS_OBJECT_NAME_INVALID;
        }
        *p = 0;

diff --git a/source/ntvfs/posix/pvfs_setfileinfo.c b/source/ntvfs/posix/pvfs_setfileinfo.c
index 31a60fac18ae99576a9886e059231d6a49d79700..0753ccb40be8b0afd67c1a5dd5526e73a59730e8 100644 (file)
--- a/source/ntvfs/posix/pvfs_setfileinfo.c
+++ b/source/ntvfs/posix/pvfs_setfileinfo.c
@@ -186,7 +186,7 @@ NTSTATUS pvfs_setfileinfo_ea_set(struct pvfs_state *pvfs,
                struct ea_struct *ea = &eas[j];
                /* see if its already there */
                for (i=0;i<ealist->num_eas;i++) {
                struct ea_struct *ea = &eas[j];
                /* see if its already there */
                for (i=0;i<ealist->num_eas;i++) {

-                       if (StrCaseCmp(ealist->eas[i].name, ea->name.s) == 0) {
+                       if (strcasecmp_m(ealist->eas[i].name, ea->name.s) == 0) {

                                ealist->eas[i].value = ea->value;
                                break;
                        }
                                ealist->eas[i].value = ea->value;
                                break;
                        }

diff --git a/source/ntvfs/posix/pvfs_streams.c b/source/ntvfs/posix/pvfs_streams.c
index 2ee5034736fa31127d130d57c3a13ed8e3d09d4b..3910baadd09ba1ba02e76a8419610a1336f051b8 100644 (file)
--- a/source/ntvfs/posix/pvfs_streams.c
+++ b/source/ntvfs/posix/pvfs_streams.c
@@ -97,7 +97,7 @@ NTSTATUS pvfs_stream_info(struct pvfs_state *pvfs, struct pvfs_filename *name, i
 
        for (i=0;i<streams->num_streams;i++) {
                struct xattr_DosStream *s = &streams->streams[i];
 
        for (i=0;i<streams->num_streams;i++) {
                struct xattr_DosStream *s = &streams->streams[i];

-               if (StrCaseCmp(s->name, name->stream_name) == 0) {
+               if (strcasecmp_m(s->name, name->stream_name) == 0) {

                        name->dos.alloc_size = pvfs_round_alloc_size(pvfs, s->alloc_size);
                        name->st.st_size     = s->size;
                        name->stream_exists = True;
                        name->dos.alloc_size = pvfs_round_alloc_size(pvfs, s->alloc_size);
                        name->st.st_size     = s->size;
                        name->stream_exists = True;


@@ -138,7 +138,7 @@ static NTSTATUS pvfs_stream_update_size(struct pvfs_state *pvfs, struct pvfs_fil
 
        for (i=0;i<streams->num_streams;i++) {
                struct xattr_DosStream *s = &streams->streams[i];
 
        for (i=0;i<streams->num_streams;i++) {
                struct xattr_DosStream *s = &streams->streams[i];

-               if (StrCaseCmp(s->name, name->stream_name) == 0) {
+               if (strcasecmp_m(s->name, name->stream_name) == 0) {

                        s->size       = size;
                        s->alloc_size = pvfs_round_alloc_size(pvfs, size);
                        break;
                        s->size       = size;
                        s->alloc_size = pvfs_round_alloc_size(pvfs, size);
                        break;


@@ -216,7 +216,7 @@ NTSTATUS pvfs_stream_delete(struct pvfs_state *pvfs,
 
        for (i=0;i<streams->num_streams;i++) {
                struct xattr_DosStream *s = &streams->streams[i];
 
        for (i=0;i<streams->num_streams;i++) {
                struct xattr_DosStream *s = &streams->streams[i];

-               if (StrCaseCmp(s->name, name->stream_name) == 0) {
+               if (strcasecmp_m(s->name, name->stream_name) == 0) {

                        memmove(s, s+1, (streams->num_streams - (i+1)) * sizeof(*s));
                        streams->num_streams--;
                        break;
                        memmove(s, s+1, (streams->num_streams - (i+1)) * sizeof(*s));
                        streams->num_streams--;
                        break;

diff --git a/source/rpc_server/lsa/dcesrv_lsa.c b/source/rpc_server/lsa/dcesrv_lsa.c
index c81eb99a0efed8c8ef4b19a970ea27dda5c05f43..b976330bee948af2f82f5ca39717ac3c39f6ad1e 100644 (file)
--- a/source/rpc_server/lsa/dcesrv_lsa.c
+++ b/source/rpc_server/lsa/dcesrv_lsa.c
@@ -1499,7 +1499,7 @@ static NTSTATUS lsa_AddRemoveAccountRights(struct dcesrv_call_state *dce_call,
                if (ldb_flag == LDB_FLAG_MOD_ADD) {
                        int j;
                        for (j=0;j<r2.out.rights->count;j++) {
                if (ldb_flag == LDB_FLAG_MOD_ADD) {
                        int j;
                        for (j=0;j<r2.out.rights->count;j++) {

-                               if (StrCaseCmp(r2.out.rights->names[j].string, 
+                               if (strcasecmp_m(r2.out.rights->names[j].string, 

                                               rights->names[i].string) == 0) {
                                        break;
                                }
                                               rights->names[i].string) == 0) {
                                        break;
                                }

diff --git a/source/torture/nbt/register.c b/source/torture/nbt/register.c
index b35808c8440e0741b9118672df042f5385396e68..4b5931d3414c3639669de4a07b992d0820e3ff62 100644 (file)
--- a/source/torture/nbt/register.c
+++ b/source/torture/nbt/register.c
@@ -33,7 +33,7 @@
        }} while (0)
 
 #define CHECK_STRING(v, correct) do { \
        }} while (0)
 
 #define CHECK_STRING(v, correct) do { \

-       if (StrCaseCmp(v, correct) != 0) { \
+       if (strcasecmp_m(v, correct) != 0) { \

                printf("(%s) Incorrect value %s='%s' - should be '%s'\n", \
                       __location__, #v, v, correct); \
                ret = False; \
                printf("(%s) Incorrect value %s='%s' - should be '%s'\n", \
                       __location__, #v, v, correct); \
                ret = False; \

diff --git a/source/torture/nbt/wins.c b/source/torture/nbt/wins.c
index 852147786edcc2870071f26aa1722329dd2a79f0..b762c8360953a04281d89f5c3294dcdaa678b016 100644 (file)
--- a/source/torture/nbt/wins.c
+++ b/source/torture/nbt/wins.c
@@ -34,7 +34,7 @@
 
 #define CHECK_STRING(v, correct) do { \
        if ((v) != (correct) && \
 
 #define CHECK_STRING(v, correct) do { \
        if ((v) != (correct) && \

-           ((v)==NULL || (correct)==NULL || StrCaseCmp(v, correct) != 0)) { \
+           ((v)==NULL || (correct)==NULL || strcasecmp_m(v, correct) != 0)) { \

                printf("(%s) Incorrect value %s='%s' - should be '%s'\n", \
                       __location__, #v, v, correct); \
                ret = False; \
                printf("(%s) Incorrect value %s='%s' - should be '%s'\n", \
                       __location__, #v, v, correct); \
                ret = False; \

diff --git a/source/torture/raw/search.c b/source/torture/raw/search.c
index d1ea290c62fa7fde6c691f18df6f210abff95eda..96ceaf0a02f224811056795dd6062c7a81938fb5 100644 (file)
--- a/source/torture/raw/search.c
+++ b/source/torture/raw/search.c
@@ -554,7 +554,7 @@ static NTSTATUS multiple_search(struct smbcli_state *cli,
        }} while (0)
 
 #define CHECK_STRING(v, correct) do { \
        }} while (0)
 
 #define CHECK_STRING(v, correct) do { \

-       if (StrCaseCmp(v, correct) != 0) { \
+       if (strcasecmp_m(v, correct) != 0) { \

                printf("(%s) Incorrect value %s='%s' - should be '%s'\n", \
                       __location__, #v, v, correct); \
                ret = False; \
                printf("(%s) Incorrect value %s='%s' - should be '%s'\n", \
                       __location__, #v, v, correct); \
                ret = False; \


@@ -900,7 +900,7 @@ static BOOL test_sorted(struct smbcli_state *cli, TALLOC_CTX *mem_ctx)
                const char *name1, *name2;
                name1 = result.list[i].both_directory_info.name.s;
                name2 = result.list[i+1].both_directory_info.name.s;
                const char *name1, *name2;
                name1 = result.list[i].both_directory_info.name.s;
                name2 = result.list[i+1].both_directory_info.name.s;

-               if (StrCaseCmp(name1, name2) > 0) {
+               if (strcasecmp_m(name1, name2) > 0) {

                        printf("non-alphabetical order at entry %d  '%s' '%s'\n", 
                               i, name1, name2);
                        printf("Server does not produce sorted directory listings (not an error)\n");
                        printf("non-alphabetical order at entry %d  '%s' '%s'\n", 
                               i, name1, name2);
                        printf("Server does not produce sorted directory listings (not an error)\n");

diff --git a/source/torture/rpc/samsync.c b/source/torture/rpc/samsync.c
index b15ee982002ea93a158ad3fad055eb0675aa4208..9cd30ef019c9902f893ecec35df7e85c3eabc6e0 100644 (file)
--- a/source/torture/rpc/samsync.c
+++ b/source/torture/rpc/samsync.c
@@ -286,7 +286,7 @@ static BOOL samsync_handle_domain(TALLOC_CTX *mem_ctx, struct samsync_state *sam
        case SAM_DATABASE_DOMAIN:
                break;
        case SAM_DATABASE_BUILTIN:
        case SAM_DATABASE_DOMAIN:
                break;
        case SAM_DATABASE_BUILTIN:

-               if (StrCaseCmp("BUILTIN", domain->domain_name.string) != 0) {
+               if (strcasecmp_m("BUILTIN", domain->domain_name.string) != 0) {

                        printf("BUILTIN domain has different name: %s\n", domain->domain_name.string);
                }
                break;
                        printf("BUILTIN domain has different name: %s\n", domain->domain_name.string);
                }
                break;


@@ -300,7 +300,7 @@ static BOOL samsync_handle_domain(TALLOC_CTX *mem_ctx, struct samsync_state *sam
                samsync_state->domain_name[database_id] = 
                        talloc_reference(samsync_state, domain->domain_name.string);
        } else {
                samsync_state->domain_name[database_id] = 
                        talloc_reference(samsync_state, domain->domain_name.string);
        } else {

-               if (StrCaseCmp(samsync_state->domain_name[database_id], domain->domain_name.string) != 0) {
+               if (strcasecmp_m(samsync_state->domain_name[database_id], domain->domain_name.string) != 0) {

                        printf("Domain has name varies!: %s != %s\n", samsync_state->domain_name[database_id], 
                               domain->domain_name.string);
                        return False;
                        printf("Domain has name varies!: %s != %s\n", samsync_state->domain_name[database_id], 
                               domain->domain_name.string);
                        return False;


@@ -371,7 +371,7 @@ static BOOL samsync_handle_policy(TALLOC_CTX *mem_ctx, struct samsync_state *sam
                samsync_state->domain_name[SAM_DATABASE_DOMAIN] = 
                        talloc_reference(samsync_state, policy->primary_domain_name.string);
        } else {
                samsync_state->domain_name[SAM_DATABASE_DOMAIN] = 
                        talloc_reference(samsync_state, policy->primary_domain_name.string);
        } else {

-               if (StrCaseCmp(samsync_state->domain_name[SAM_DATABASE_DOMAIN], policy->primary_domain_name.string) != 0) {
+               if (strcasecmp_m(samsync_state->domain_name[SAM_DATABASE_DOMAIN], policy->primary_domain_name.string) != 0) {

                        printf("PRIMARY domain has name varies between DOMAIN and POLICY!: %s != %s\n", samsync_state->domain_name[SAM_DATABASE_DOMAIN], 
                               policy->primary_domain_name.string);
                        return False;
                        printf("PRIMARY domain has name varies between DOMAIN and POLICY!: %s != %s\n", samsync_state->domain_name[SAM_DATABASE_DOMAIN], 
                               policy->primary_domain_name.string);
                        return False;


@@ -1194,7 +1194,7 @@ static BOOL test_DatabaseSync(struct samsync_state *samsync_state,
        for (t=samsync_state->trusted_domains; t; t=t->next) {
                char *secret_name = talloc_asprintf(trustdom_ctx, "G$$%s", t->name);
                for (s=samsync_state->secrets; s; s=s->next) {
        for (t=samsync_state->trusted_domains; t; t=t->next) {
                char *secret_name = talloc_asprintf(trustdom_ctx, "G$$%s", t->name);
                for (s=samsync_state->secrets; s; s=s->next) {

-                       if (StrCaseCmp(s->name, secret_name) == 0) {
+                       if (strcasecmp_m(s->name, secret_name) == 0) {

                                NTSTATUS nt_status;
                                struct samr_Password nt_hash;
                                mdfour(nt_hash.hash, s->secret.data, s->secret.length);
                                NTSTATUS nt_status;
                                struct samr_Password nt_hash;
                                mdfour(nt_hash.hash, s->secret.data, s->secret.length);

diff --git a/source/torture/t_strcmp.c b/source/torture/t_strcmp.c
index 622769001ba4a834bfe9f60c47b25bd24ec2b6af..15d000c98f9d10e3121cef73d1d9337b1c37facd 100644 (file)
--- a/source/torture/t_strcmp.c
+++ b/source/torture/t_strcmp.c
@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 2003 by Martin Pool
  *
 /*
  * Copyright (C) 2003 by Martin Pool
  *

- * Test harness for StrCaseCmp
+ * Test harness for strcasecmp_m

  */
 
 #include "includes.h"
  */
 
 #include "includes.h"


@@ -14,7 +14,7 @@ int main(int argc, char *argv[])
                return 2;
        }
        
                return 2;
        }
        

-       printf("%d\n", StrCaseCmp(argv[1], argv[2]));
+       printf("%d\n", strcasecmp_m(argv[1], argv[2]));

        
        return 0;
 }
        
        return 0;
 }

diff --git a/source/torture/torture_util.c b/source/torture/torture_util.c
index 42e2608c41bbc5727bc44f83e4d08292476b7467..59eef815694cabf71ad761a646005cab7351f136 100644 (file)
--- a/source/torture/torture_util.c
+++ b/source/torture/torture_util.c
@@ -366,7 +366,7 @@ NTSTATUS torture_check_ea(struct smbcli_state *cli,
                return NT_STATUS_EA_CORRUPT_ERROR;
        }
 
                return NT_STATUS_EA_CORRUPT_ERROR;
        }
 

-       if (StrCaseCmp(eaname, info.ea_list.out.eas[0].name.s) != 0) {
+       if (strcasecmp_m(eaname, info.ea_list.out.eas[0].name.s) != 0) {

                printf("Expected ea '%s' not '%s' in ea_list\n",
                       eaname, info.ea_list.out.eas[0].name.s);
                talloc_free(mem_ctx);
                printf("Expected ea '%s' not '%s' in ea_list\n",
                       eaname, info.ea_list.out.eas[0].name.s);
                talloc_free(mem_ctx);

diff --git a/source/utils/net/net.c b/source/utils/net/net.c
index 787f71705bb47bf7a9402c48099fe7682e8f310f..b6f54a46ce5a416fe9f26cd219a61e8e1dfdf078 100644 (file)
--- a/source/utils/net/net.c
+++ b/source/utils/net/net.c
@@ -65,7 +65,7 @@ int net_run_function(struct net_context *ctx,
        }
 
        for (i=0; functable[i].name; i++) {
        }
 
        for (i=0; functable[i].name; i++) {

-               if (StrCaseCmp(argv[0], functable[i].name) == 0)
+               if (strcasecmp_m(argv[0], functable[i].name) == 0)

                        return functable[i].fn(ctx, argc-1, argv+1);
        }
 
                        return functable[i].fn(ctx, argc-1, argv+1);
        }
 


@@ -88,7 +88,7 @@ int net_run_usage(struct net_context *ctx,
        }
 */
        for (i=0; functable[i].name; i++) {
        }
 */
        for (i=0; functable[i].name; i++) {

-               if (StrCaseCmp(argv[0], functable[i].name) == 0)
+               if (strcasecmp_m(argv[0], functable[i].name) == 0)

                        if (functable[i].usage) {
                                return functable[i].usage(ctx, argc-1, argv+1);
                        }
                        if (functable[i].usage) {
                                return functable[i].usage(ctx, argc-1, argv+1);
                        }