Removed strupper/strlower macros that automatically map to strupper_m/strlower_m.

I really want people to think about when they're using multibyte strings.
Jeremy.

diff --git a/source/auth/auth_builtin.c b/source/auth/auth_builtin.c
index 0358836793003718e57f25c2f90f5839844f8b49..f7cdfe3fd2e9b76405175b62dd2b2666bacbe095 100644 (file)
--- a/source/auth/auth_builtin.c
+++ b/source/auth/auth_builtin.c
@@ -87,11 +87,11 @@ static NTSTATUS check_name_to_ntstatus_security(const struct auth_context *auth_
        fstrcpy(user, user_info->smb_name.str);
        
        if (strncasecmp("NT_STATUS", user, strlen("NT_STATUS")) == 0) {
-               strupper(user);
+               strupper_m(user);
                return nt_status_string_to_code(user);
        }
 
-       strlower(user);
+       strlower_m(user);
        error_num = strtoul(user, NULL, 16);
        
        DEBUG(5,("check_name_to_ntstatus_security: Error for user %s was %lx\n", user, error_num));

diff --git a/source/auth/auth_server.c b/source/auth/auth_server.c
index af0848e12a8bc9bc6b1dfa98301279d527de16ed..30e0e13a56e9f5999340d0e5a5c755219d71f395 100644 (file)
--- a/source/auth/auth_server.c
+++ b/source/auth/auth_server.c
@@ -50,7 +50,7 @@ static struct cli_state *server_cryptkey(TALLOC_CTX *mem_ctx)
 
         while(next_token( &p, desthost, LIST_SEP, sizeof(desthost))) {
                standard_sub_basic(current_user_info.smb_name, desthost, sizeof(desthost));
-               strupper(desthost);
+               strupper_m(desthost);
 
                if(!resolve_name( desthost, &dest_ip, 0x20)) {
                        DEBUG(1,("server_cryptkey: Can't resolve address for %s\n",desthost));

diff --git a/source/auth/pass_check.c b/source/auth/pass_check.c
index 88b82e34746eba77a1204e18926b9a7c891aa15a..1ac8c1815a69712461e286174d729ba29f369896 100644 (file)
--- a/source/auth/pass_check.c
+++ b/source/auth/pass_check.c
@@ -757,7 +757,7 @@ NTSTATUS pass_check(const struct passwd *pass, const char *user, const char *pas
 
        /* try all lowercase if it's currently all uppercase */
        if (strhasupper(pass2)) {
-               strlower(pass2);
+               strlower_m(pass2);
                if NT_STATUS_IS_OK(nt_status = password_check(pass2)) {
                        if (fn)
                                fn(user, pass2);
@@ -771,8 +771,7 @@ NTSTATUS pass_check(const struct passwd *pass, const char *user, const char *pas
        }
 
        /* last chance - all combinations of up to level chars upper! */
-       strlower(pass2);
-
+       strlower_m(pass2);
  
         if (NT_STATUS_IS_OK(nt_status = string_combinations(pass2, password_check, level))) {
                 if (fn)

diff --git a/source/client/client.c b/source/client/client.c
index ea21957d73df0d17f7fbb54dfc118acd13c70846..d9c3a7aa1b197b6c05628d247150cb27ccae434a 100644 (file)
--- a/source/client/client.c
+++ b/source/client/client.c
@@ -659,7 +659,7 @@ static int do_get(char *rname, char *lname, BOOL reget)
        GetTimeOfDay(&tp_start);
 
        if (lowercase) {
-               strlower(lname);
+               strlower_m(lname);
        }
 
        fnum = cli_open(cli, rname, O_RDONLY, DENY_NONE);
@@ -834,7 +834,7 @@ static void do_mget(file_info *finfo)
 
        unix_format(finfo->name);
        if (lowercase)
-               strlower(finfo->name);
+               strlower_m(finfo->name);
        
        if (!directory_exist(finfo->name,NULL) && 
            mkdir(finfo->name,0777) != 0) {

diff --git a/source/client/clitar.c b/source/client/clitar.c
index dfda997ca26907c43fbbe95dbb399feb8ba6319a..2ef2832e5046220e67161a2e2c6eb39c6ee1232f 100644 (file)
--- a/source/client/clitar.c
+++ b/source/client/clitar.c
@@ -197,7 +197,7 @@ static void writetarheader(int f, const char *aname, SMB_BIG_UINT size, time_t m
   fixtarname(hb.dbuf.name, aname, (l >= NAMSIZ) ? NAMSIZ : l + 1);
 
   if (lowercase)
-    strlower(hb.dbuf.name);
+    strlower_m(hb.dbuf.name);
 
   /* write out a "standard" tar format header */
 

diff --git a/source/include/safe_string.h b/source/include/safe_string.h
index df3633d91d911aa848c22844d7d2f163c9d598c0..6656f4f6bbb804fbc61d7713895c9dd7d393c535 100644 (file)
--- a/source/include/safe_string.h
+++ b/source/include/safe_string.h
@@ -209,9 +209,4 @@ size_t __unsafe_string_function_usage_here_char__(void);
 
 #endif
 
-/* replace some string functions with multi-byte
-   versions */
-#define strlower(s) strlower_m(s)
-#define strupper(s) strupper_m(s)
-
 #endif

diff --git a/source/lib/charcnv.c b/source/lib/charcnv.c
index 55cf73d2b11058552a7a73167ec44a76e72a165a..4e9c2c15923fa406af22a75b41fe4b6da993702c 100644 (file)
--- a/source/lib/charcnv.c
+++ b/source/lib/charcnv.c
@@ -387,7 +387,7 @@ size_t push_ascii(void *dest, const char *src, size_t dest_len, int flags)
 
        if (flags & STR_UPPER) {
                pstrcpy(tmpbuf, src);
-               strupper(tmpbuf);
+               strupper_m(tmpbuf);
                src = tmpbuf;
        }
 
@@ -488,7 +488,7 @@ size_t push_ucs2(const void *base_ptr, void *dest, const char *src, size_t dest_
 
        if (flags & STR_UPPER) {
                pstrcpy(tmpbuf, src);
-               strupper(tmpbuf);
+               strupper_m(tmpbuf);
                src = tmpbuf;
        }
 
@@ -566,7 +566,7 @@ static size_t push_utf8(void *dest, const char *src, size_t dest_len, int flags)
 
        if (flags & STR_UPPER) {
                pstrcpy(tmpbuf, src);
-               strupper(tmpbuf);
+               strupper_m(tmpbuf);
                src = tmpbuf;
        }
 

diff --git a/source/lib/substitute.c b/source/lib/substitute.c
index a53a50a060e303a492fdc59330d6b0a21f64f1af..ac2cf687c498f2fa3b79b8847d47a23194be6cfc 100644 (file)
--- a/source/lib/substitute.c
+++ b/source/lib/substitute.c
@@ -58,7 +58,7 @@ void set_local_machine_name(const char* local_name, BOOL perm)
 
        fstrcpy(tmp_local_machine,local_name);
        trim_string(tmp_local_machine," "," ");
-       strlower(tmp_local_machine);
+       strlower_m(tmp_local_machine);
        alpha_strcpy(local_machine,tmp_local_machine,SAFE_NETBIOS_CHARS,sizeof(local_machine)-1);
 }
 
@@ -80,7 +80,7 @@ void set_remote_machine_name(const char* remote_name, BOOL perm)
 
        fstrcpy(tmp_remote_machine,remote_name);
        trim_string(tmp_remote_machine," "," ");
-       strlower(tmp_remote_machine);
+       strlower_m(tmp_remote_machine);
        alpha_strcpy(remote_machine,tmp_remote_machine,SAFE_NETBIOS_CHARS,sizeof(remote_machine)-1);
 }
 
@@ -111,7 +111,7 @@ void sub_set_smb_name(const char *name)
 
        fstrcpy(tmp,name);
        trim_string(tmp," "," ");
-       strlower(tmp);
+       strlower_m(tmp);
        alpha_strcpy(smb_user_name,tmp,SAFE_NETBIOS_CHARS,sizeof(smb_user_name)-1);
 }
 
@@ -331,7 +331,7 @@ void standard_sub_basic(const char *smb_name, char *str,size_t len)
                switch (*(p+1)) {
                case 'U' : 
                        fstrcpy(tmp_str, smb_name);
-                       strlower(tmp_str);
+                       strlower_m(tmp_str);
                        string_sub(p,"%U",tmp_str,l);
                        break;
                case 'G' :
@@ -344,7 +344,7 @@ void standard_sub_basic(const char *smb_name, char *str,size_t len)
                        break;
                case 'D' :
                        fstrcpy(tmp_str, current_user_info.domain);
-                       strupper(tmp_str);
+                       strupper_m(tmp_str);
                        string_sub(p,"%D", tmp_str,l);
                        break;
                case 'I' :
@@ -357,7 +357,7 @@ void standard_sub_basic(const char *smb_name, char *str,size_t len)
                                pstring temp_name;
 
                                pstrcpy(temp_name, global_myname());
-                               strlower(temp_name);
+                               strlower_m(temp_name);
                                string_sub(p,"%L", temp_name,l); 
                        }
                        break;

diff --git a/source/lib/username.c b/source/lib/username.c
index 0005372a8f8875ae485d1d494ffe51e2479a1977..98b8f33aae30990e5b245febdec17903150b310d 100644 (file)
--- a/source/lib/username.c
+++ b/source/lib/username.c
@@ -219,7 +219,7 @@ static struct passwd *Get_Pwnam_internals(const char *user, char *user2)
 
        /* Try in all lower case first as this is the most 
           common case on UNIX systems */
-       strlower(user2);
+       strlower_m(user2);
        DEBUG(5,("Trying _Get_Pwnam(), username as lowercase is %s\n",user2));
        ret = getpwnam_alloc(user2);
        if(ret)
@@ -234,7 +234,7 @@ static struct passwd *Get_Pwnam_internals(const char *user, char *user2)
        }
 
        /* Try as uppercase, if username wasn't originally uppercase */
-       strupper(user2);
+       strupper_m(user2);
        if(strcmp(user, user2) != 0) {
                DEBUG(5,("Trying _Get_Pwnam(), username as uppercase is %s\n", user2));
                ret = getpwnam_alloc(user2);
@@ -243,7 +243,7 @@ static struct passwd *Get_Pwnam_internals(const char *user, char *user2)
        }
 
        /* Try all combinations up to usernamelevel */
-       strlower(user2);
+       strlower_m(user2);
        DEBUG(5,("Checking combinations of %d uppercase letters in %s\n", lp_usernamelevel(), user2));
        ret = uname_string_combinations(user2, getpwnam_alloc, lp_usernamelevel());
 

diff --git a/source/lib/util.c b/source/lib/util.c
index a99e2163db53fb49d0aca6c42c869f24bb35fa01..0a2b86ab57801c7c182d6804ecad0ead9cce20ff 100644 (file)
--- a/source/lib/util.c
+++ b/source/lib/util.c
@@ -99,7 +99,7 @@ BOOL set_global_myname(const char *myname)
        smb_myname = strdup(myname);
        if (!smb_myname)
                return False;
-       strupper(smb_myname);
+       strupper_m(smb_myname);
        return True;
 }
 
@@ -118,7 +118,7 @@ BOOL set_global_myworkgroup(const char *myworkgroup)
        smb_myworkgroup = strdup(myworkgroup);
        if (!smb_myworkgroup)
                return False;
-       strupper(smb_myworkgroup);
+       strupper_m(smb_myworkgroup);
        return True;
 }
 
@@ -137,7 +137,7 @@ BOOL set_global_scope(const char *scope)
        smb_scope = strdup(scope);
        if (!smb_scope)
                return False;
-       strupper(smb_scope);
+       strupper_m(smb_scope);
        return True;
 }
 
@@ -184,7 +184,7 @@ static BOOL set_my_netbios_names(const char *name, int i)
        smb_my_netbios_names[i] = strdup(name);
        if (!smb_my_netbios_names[i])
                return False;
-       strupper(smb_my_netbios_names[i]);
+       strupper_m(smb_my_netbios_names[i]);
        return True;
 }
 
@@ -265,7 +265,7 @@ BOOL init_names(void)
        p = strchr( local_machine, ' ' );
        if (p)
                *p = 0;
-       strlower( local_machine );
+       strlower_m( local_machine );
 
        DEBUG( 5, ("Netbios name list:-\n") );
        for( n=0; my_netbios_names(n); n++ )
@@ -2336,8 +2336,8 @@ BOOL mask_match(const char *string, char *pattern, BOOL is_case_sensitive)
 
        fstrcpy(p2, pattern);
        fstrcpy(s2, string);
-       strlower(p2); 
-       strlower(s2);
+       strlower_m(p2); 
+       strlower_m(s2);
        return ms_fnmatch(p2, s2, Protocol) == 0;
 }
 
@@ -2453,8 +2453,8 @@ BOOL unix_wild_match(const char *pattern, const char *string)
 
        pstrcpy(p2, pattern);
        pstrcpy(s2, string);
-       strlower(p2);
-       strlower(s2);
+       strlower_m(p2);
+       strlower_m(s2);
 
        /* Remove any *? and ** from the pattern as they are meaningless */
        for(p = p2; *p; p++)

diff --git a/source/lib/util_str.c b/source/lib/util_str.c
index ac8fccfa5aafca04018f4dd6150596b81cee409b..96fbc3f1247d81a4d185d856bd09d532e5f73fdb 100644 (file)
--- a/source/lib/util_str.c
+++ b/source/lib/util_str.c
@@ -314,7 +314,7 @@ char *strupper_static(const char *s)
        static pstring str;
 
        pstrcpy(str, s);
-       strupper(str);
+       strupper_m(str);
 
        return str;
 }
@@ -327,9 +327,9 @@ void strnorm(char *s)
 {
        extern int case_default;
        if (case_default == CASE_UPPER)
-               strupper(s);
+               strupper_m(s);
        else
-               strlower(s);
+               strlower_m(s);
 }
 
 /**

diff --git a/source/libads/kerberos_verify.c b/source/libads/kerberos_verify.c
index 65b557af574b30c1077027c15fb8aa3f69b1d29e..2f4d94f782dd3ce0a631ffe454d80d331e81a159 100644 (file)
--- a/source/libads/kerberos_verify.c
+++ b/source/libads/kerberos_verify.c
@@ -84,7 +84,7 @@ NTSTATUS ads_verify_ticket(ADS_STRUCT *ads, const DATA_BLOB *ticket,
        }
 
        fstrcpy(myname, global_myname());
-       strlower(myname);
+       strlower_m(myname);
        asprintf(&host_princ_s, "HOST/%s@%s", myname, lp_realm());
        ret = krb5_parse_name(context, host_princ_s, &host_princ);
        if (ret) {

diff --git a/source/libads/krb5_setpw.c b/source/libads/krb5_setpw.c
index df749d04d36d554f646cb4f80737038b39770248..80ef6cdf01c55d623d8783e9a7044aa045c25493 100644 (file)
--- a/source/libads/krb5_setpw.c
+++ b/source/libads/krb5_setpw.c
@@ -671,7 +671,7 @@ ADS_STATUS ads_set_machine_password(ADS_STRUCT *ads,
        char *host = strdup(hostname);
        char *principal; 
 
-       strlower(host);
+       strlower_m(host);
 
        /*
          we need to use the '$' form of the name here, as otherwise the

diff --git a/source/libads/ldap.c b/source/libads/ldap.c
index 53c71c405ac6cdc6808cbb94e1e5c2c186bbe230..1886b525d98d7053f588fc81b2bd06b7167c65da 100644 (file)
--- a/source/libads/ldap.c
+++ b/source/libads/ldap.c
@@ -216,7 +216,7 @@ got_connection:
                /* by default use the machine account */
                fstring myname;
                fstrcpy(myname, global_myname());
-               strlower(myname);
+               strlower_m(myname);
                asprintf(&ads->auth.user_name, "HOST/%s", myname);
        }
 
@@ -997,13 +997,13 @@ static ADS_STATUS ads_add_machine_acct(ADS_STRUCT *ads, const char *hostname,
        psp = talloc_asprintf(ctx, "HOST/%s.%s", 
                              hostname, 
                              ads->config.realm);
-       strlower(&psp[5]);
+       strlower_m(&psp[5]);
        servicePrincipalName[1] = psp;
        servicePrincipalName[2] = talloc_asprintf(ctx, "CIFS/%s", hostname);
        psp2 = talloc_asprintf(ctx, "CIFS/%s.%s", 
                               hostname, 
                               ads->config.realm);
-       strlower(&psp2[5]);
+       strlower_m(&psp2[5]);
        servicePrincipalName[3] = psp2;
 
        free(ou_str);
@@ -1285,7 +1285,7 @@ ADS_STATUS ads_join_realm(ADS_STRUCT *ads, const char *hostname,
 
        /* hostname must be lowercase */
        host = strdup(hostname);
-       strlower(host);
+       strlower_m(host);
 
        status = ads_find_machine_acct(ads, (void **)&res, host);
        if (ADS_ERR_OK(status) && ads_count_replies(ads, res) == 1) {
@@ -1330,7 +1330,7 @@ ADS_STATUS ads_leave_realm(ADS_STRUCT *ads, const char *hostname)
 
        /* hostname must be lowercase */
        host = strdup(hostname);
-       strlower(host);
+       strlower_m(host);
 
        status = ads_find_machine_acct(ads, &res, host);
        if (!ADS_ERR_OK(status)) {

diff --git a/source/libsmb/clirap.c b/source/libsmb/clirap.c
index 9d4411797dd25d5cf485849df8d915802f86590d..a307ac6ccf8f90bf7c3a9bc1ec8f619864187a7a 100644 (file)
--- a/source/libsmb/clirap.c
+++ b/source/libsmb/clirap.c
@@ -92,13 +92,13 @@ BOOL cli_NetWkstaUserLogon(struct cli_state *cli,char *user, char *workstation)
        SSVAL(p,0,1);
        p += 2;
        pstrcpy_base(p,user,param);
-       strupper(p);
+       strupper_m(p);
        p += 21;
        p++;
        p += 15;
        p++; 
        pstrcpy_base(p, workstation, param);
-       strupper(p);
+       strupper_m(p);
        p += 16;
        SSVAL(p, 0, CLI_BUFFER_SIZE);
        p += 2;

diff --git a/source/libsmb/clirap2.c b/source/libsmb/clirap2.c
index 948e88061a535ab31fb763d769d517fec36186c4..669b33860dae88d8ce9f4620d471ab67edabfc99 100644 (file)
--- a/source/libsmb/clirap2.c
+++ b/source/libsmb/clirap2.c
@@ -1396,11 +1396,11 @@ BOOL cli_NetWkstaUserLogoff(struct cli_state *cli,char *user, char *workstation)
   PUTDWORD(p, 0); /* Null pointer */
   PUTDWORD(p, 0); /* Null pointer */
   fstrcpy(upperbuf, user);
-  strupper(upperbuf);
+  strupper_m(upperbuf);
   PUTSTRINGF(p, upperbuf, RAP_USERNAME_LEN);
   p++; /* strange format, but ok */
   fstrcpy(upperbuf, workstation);
-  strupper(upperbuf);
+  strupper_m(upperbuf);
   PUTSTRINGF(p, upperbuf, RAP_MACHNAME_LEN);
   PUTWORD(p, CLI_BUFFER_SIZE);
   PUTWORD(p, CLI_BUFFER_SIZE);

diff --git a/source/libsmb/namequery_dc.c b/source/libsmb/namequery_dc.c
index 8bfb00b9adcb4e6385e5ed9b7d5c0d4cf093e9ce..c9d45a7acc19b5dd4b3d2501bbbd49c3f021b214 100644 (file)
--- a/source/libsmb/namequery_dc.c
+++ b/source/libsmb/namequery_dc.c
@@ -57,7 +57,7 @@ static BOOL ads_dc_name(const char *domain, struct in_addr *dc_ip, fstring srv_n
                return False;
 
        fstrcpy(srv_name, ads->config.ldap_server_name);
-       strupper(srv_name);
+       strupper_m(srv_name);
        *dc_ip = ads->ldap_ip;
        ads_destroy(&ads);
        

diff --git a/source/libsmb/nmblib.c b/source/libsmb/nmblib.c
index b96111240f1e5795f4cb96767a125f4b8c14ae1d..157a2bb43cba43e1ea0fc8528d3b009858d004ed 100644 (file)
--- a/source/libsmb/nmblib.c
+++ b/source/libsmb/nmblib.c
@@ -823,7 +823,7 @@ void make_nmb_name( struct nmb_name *n, const char *name, int type)
        push_ascii(n->name, name, 16, STR_TERMINATE|STR_UPPER);
        n->name_type = (unsigned int)type & 0xFF;
        StrnCpy( n->scope, global_scope(), 63 );
-       strupper( n->scope );
+       strupper_m( n->scope );
 }
 
 /*******************************************************************

diff --git a/source/libsmb/ntlmssp.c b/source/libsmb/ntlmssp.c
index 636e384e657208a5c3b90ab96163f25cc97ff571..609b394560c316b1ec1279a1953b56045d403c73 100644 (file)
--- a/source/libsmb/ntlmssp.c
+++ b/source/libsmb/ntlmssp.c
@@ -175,11 +175,11 @@ static NTSTATUS ntlmssp_server_negotiate(struct ntlmssp_state *ntlmssp_state,
        /* This should be a 'netbios domain -> DNS domain' mapping */
        dnsdomname[0] = '\0';
        get_mydomname(dnsdomname);
-       strlower(dnsdomname);
+       strlower_m(dnsdomname);
        
        dnsname[0] = '\0';
        get_myfullname(dnsname);
-       strlower(dnsname);
+       strlower_m(dnsname);
        
        if (chal_flags & NTLMSSP_CHAL_TARGET_INFO) 
        {

diff --git a/source/msdfs/msdfs.c b/source/msdfs/msdfs.c
index d4ec0b830fdd6819152db7720992dd6061267314..ce6e64d9157ddfc02f29e68450a1edd81a370813 100644 (file)
--- a/source/msdfs/msdfs.c
+++ b/source/msdfs/msdfs.c
@@ -164,7 +164,7 @@ BOOL is_msdfs_link(connection_struct* conn, char* path,
        if (!path || !conn)
                return False;
 
-       strlower(path);
+       strlower_m(path);
 
        if (sbufp == NULL)
                sbufp = &st;
@@ -740,7 +740,7 @@ static BOOL junction_to_local_path(struct junction_map* jn, char* path,
 
        safe_strcpy(path, lp_pathname(snum), max_pathlen-1);
        safe_strcat(path, "/", max_pathlen-1);
-       strlower(jn->volume_name);
+       strlower_m(jn->volume_name);
        safe_strcat(path, jn->volume_name, max_pathlen-1);
 
        pstrcpy(conn_path, lp_pathname(snum));

diff --git a/source/nmbd/nmbd_browserdb.c b/source/nmbd/nmbd_browserdb.c
index d7c852605e2cd7c57f48969fd4a4a1a324a4cc3b..4a302ddfd411e2e8760a071f08d337aed89c4b64 100644 (file)
--- a/source/nmbd/nmbd_browserdb.c
+++ b/source/nmbd/nmbd_browserdb.c
@@ -37,7 +37,6 @@
 
 ubi_dlNewList( lmb_browserlist );
 
-
 /* -------------------------------------------------------------------------- **
  * Functions...
  */
@@ -52,9 +51,9 @@ ubi_dlNewList( lmb_browserlist );
  * ************************************************************************** **
  */
 static void remove_lmb_browser_entry( struct browse_cache_record *browc )
-  {
-  safe_free( ubi_dlRemThis( lmb_browserlist, browc ) );
-  } /* remove_lmb_browser_entry */
+{
+       safe_free( ubi_dlRemThis( lmb_browserlist, browc ) );
+}
 
 /* ************************************************************************** **
  * Update a browser death time.
@@ -65,10 +64,10 @@ static void remove_lmb_browser_entry( struct browse_cache_record *browc )
  * ************************************************************************** **
  */
 void update_browser_death_time( struct browse_cache_record *browc )
-  {
-  /* Allow the new lmb to miss an announce period before we remove it. */
-  browc->death_time = time(NULL) + ( (CHECK_TIME_MST_ANNOUNCE + 2) * 60 );
-  } /* update_browser_death_time */
+{
+       /* Allow the new lmb to miss an announce period before we remove it. */
+       browc->death_time = time(NULL) + ( (CHECK_TIME_MST_ANNOUNCE + 2) * 60 );
+}
 
 /* ************************************************************************** **
  * Create a browser entry and add it to the local master browser list.
@@ -84,48 +83,47 @@ void update_browser_death_time( struct browse_cache_record *browc )
 struct browse_cache_record *create_browser_in_lmb_cache( char *work_name, 
                                                          char *browser_name, 
                                                          struct in_addr ip )
-  {
-  struct browse_cache_record *browc;
-  time_t now = time( NULL );
+{
+       struct browse_cache_record *browc;
+       time_t now = time( NULL );
 
-  browc = (struct browse_cache_record *)malloc( sizeof( *browc ) );
+       browc = (struct browse_cache_record *)malloc( sizeof( *browc ) );
 
-  if( NULL == browc )
-    {
-    DEBUG( 0, ("create_browser_in_lmb_cache: malloc fail !\n") );
-    return( NULL );
-    }
+       if( NULL == browc ) {
+               DEBUG( 0, ("create_browser_in_lmb_cache: malloc fail !\n") );
+               return( NULL );
+       }
 
-  memset( (char *)browc, '\0', sizeof( *browc ) );
+       memset( (char *)browc, '\0', sizeof( *browc ) );
   
-  /* For a new lmb entry we want to sync with it after one minute. This
-     will allow it time to send out a local announce and build its
-     browse list.
-   */
-  browc->sync_time = now + 60;
-
-  /* Allow the new lmb to miss an announce period before we remove it. */
-  browc->death_time = now + ( (CHECK_TIME_MST_ANNOUNCE + 2) * 60 );
-
-  pstrcpy(  browc->lmb_name, browser_name);
-  pstrcpy(  browc->work_group, work_name);
-  strupper( browc->lmb_name );
-  strupper( browc->work_group );
+       /* For a new lmb entry we want to sync with it after one minute. This
+        will allow it time to send out a local announce and build its
+        browse list.
+       */
+
+       browc->sync_time = now + 60;
+
+       /* Allow the new lmb to miss an announce period before we remove it. */
+       browc->death_time = now + ( (CHECK_TIME_MST_ANNOUNCE + 2) * 60 );
+
+       pstrcpy(  browc->lmb_name, browser_name);
+       pstrcpy(  browc->work_group, work_name);
+       strupper_m( browc->lmb_name );
+       strupper_m( browc->work_group );
   
-  browc->ip = ip;
+       browc->ip = ip;
  
-  (void)ubi_dlAddTail( lmb_browserlist, browc );
-
-  if( DEBUGLVL( 3 ) )
-    {
-    Debug1( "nmbd_browserdb:create_browser_in_lmb_cache()\n" );
-    Debug1( "  Added lmb cache entry for workgroup %s ", browc->work_group );
-    Debug1( "name %s IP %s ", browc->lmb_name, inet_ntoa(ip) );
-    Debug1( "ttl %d\n", (int)browc->death_time );
-    }
+       (void)ubi_dlAddTail( lmb_browserlist, browc );
+
+       if( DEBUGLVL( 3 ) ) {
+               Debug1( "nmbd_browserdb:create_browser_in_lmb_cache()\n" );
+               Debug1( "  Added lmb cache entry for workgroup %s ", browc->work_group );
+               Debug1( "name %s IP %s ", browc->lmb_name, inet_ntoa(ip) );
+               Debug1( "ttl %d\n", (int)browc->death_time );
+       }
   
-  return( browc );
-  } /* create_browser_in_lmb_cache */
+       return( browc );
+}
 
 /* ************************************************************************** **
  * Find a browser entry in the local master browser list.
@@ -137,17 +135,16 @@ struct browse_cache_record *create_browser_in_lmb_cache( char *work_name,
  * ************************************************************************** **
  */
 struct browse_cache_record *find_browser_in_lmb_cache( char *browser_name )
-  {
-  struct browse_cache_record *browc;
+{
+       struct browse_cache_record *browc;
 
-  for( browc = (struct browse_cache_record *)ubi_dlFirst( lmb_browserlist );
-       browc;
-       browc = (struct browse_cache_record *)ubi_dlNext( browc ) )
-    if( strequal( browser_name, browc->lmb_name ) )
-      break;
+       for( browc = (struct browse_cache_record *)ubi_dlFirst( lmb_browserlist );
+                       browc; browc = (struct browse_cache_record *)ubi_dlNext( browc ) )
+               if( strequal( browser_name, browc->lmb_name ) )
+                       break;
 
-  return( browc );
-  } /* find_browser_in_lmb_cache */
+       return( browc );
+}
 
 /* ************************************************************************** **
  *  Expire timed out browsers in the browserlist.
@@ -159,24 +156,20 @@ struct browse_cache_record *find_browser_in_lmb_cache( char *browser_name )
  * ************************************************************************** **
  */
 void expire_lmb_browsers( time_t t )
-  {
-  struct browse_cache_record *browc;
-  struct browse_cache_record *nextbrowc;
-
-  for( browc = (struct browse_cache_record *)ubi_dlFirst( lmb_browserlist );
-       browc;
-       browc = nextbrowc )
-    {
-    nextbrowc = (struct browse_cache_record *)ubi_dlNext( browc );
-
-    if( browc->death_time < t )
-      {
-      if( DEBUGLVL( 3 ) )
-        {
-        Debug1( "nmbd_browserdb:expire_lmb_browsers()\n" );
-        Debug1( "  Removing timed out lmb entry %s\n", browc->lmb_name );
-        }
-      remove_lmb_browser_entry( browc );
-      }
-    }
-  } /* expire_lmb_browsers */
+{
+       struct browse_cache_record *browc;
+       struct browse_cache_record *nextbrowc;
+
+       for( browc = (struct browse_cache_record *)ubi_dlFirst( lmb_browserlist );
+                       browc; browc = nextbrowc ) {
+               nextbrowc = (struct browse_cache_record *)ubi_dlNext( browc );
+
+               if( browc->death_time < t ) {
+                       if( DEBUGLVL( 3 ) ) {
+                               Debug1( "nmbd_browserdb:expire_lmb_browsers()\n" );
+                               Debug1( "  Removing timed out lmb entry %s\n", browc->lmb_name );
+                       }
+                       remove_lmb_browser_entry( browc );
+               }
+       }
+}

diff --git a/source/nmbd/nmbd_browsesync.c b/source/nmbd/nmbd_browsesync.c
index 381f65e0c852199c583d18fe6b001eae6f7eb9cb..26d4735744fa791847c09dac874d50713bf73a36 100644 (file)
--- a/source/nmbd/nmbd_browsesync.c
+++ b/source/nmbd/nmbd_browsesync.c
@@ -127,7 +127,7 @@ static void announce_local_master_browser_to_domain_master_browser( struct work_
   p++;
 
   fstrcpy(myname, global_myname());
-  strupper(myname);
+  strupper_m(myname);
   myname[15]='\0';
   push_pstring_base(p, myname, outbuf);
 

diff --git a/source/nmbd/nmbd_elections.c b/source/nmbd/nmbd_elections.c
index 339a27d2078c4ba626844479ad11e397f01809d6..b948eb9d04ea5bef6a19adb9fd636a440dd08244 100644 (file)
--- a/source/nmbd/nmbd_elections.c
+++ b/source/nmbd/nmbd_elections.c
@@ -48,7 +48,7 @@ static void send_election_dgram(struct subnet_record *subrec, const char *workgr
   SIVAL(p,5,timeup*1000); /* ms - Despite what the spec says. */
   p += 13;
   pstrcpy_base(p, server_name, outbuf);
-  strupper(p);
+  strupper_m(p);
   p = skip_string(p,1);
   
   send_mailslot(False, BROWSE_MAILSLOT, outbuf, PTR_DIFF(p,outbuf),

diff --git a/source/nmbd/nmbd_incomingdgrams.c b/source/nmbd/nmbd_incomingdgrams.c
index 16fecbccd952ea9392db5279b37dc47ba43fc255..80465ada0dc4d0e5ecaabeb4e4ef4cacd48e5e60 100644 (file)
--- a/source/nmbd/nmbd_incomingdgrams.c
+++ b/source/nmbd/nmbd_incomingdgrams.c
@@ -580,7 +580,7 @@ static void send_backup_list_response(struct subnet_record *subrec,
   /* We always return at least one name - our own. */
   count = 1;
   fstrcpy(myname, global_myname());
-  strupper(myname);
+  strupper_m(myname);
   myname[15]='\0';
   push_pstring_base(p, myname, outbuf);
 
@@ -614,7 +614,7 @@ static void send_backup_list_response(struct subnet_record *subrec,
       continue;
 
     StrnCpy(p, servrec->serv.name, 15);
-    strupper(p);
+    strupper_m(p);
     count++;
 
     DEBUG(5,("send_backup_list_response: Adding server %s number %d\n",

diff --git a/source/nmbd/nmbd_incomingrequests.c b/source/nmbd/nmbd_incomingrequests.c
index a8168566f1fe3b334449d76fe645b832e9ff7120..a3faf5e1046aeb7d7bc9c81f9725b3e8d7009c3c 100644 (file)
--- a/source/nmbd/nmbd_incomingrequests.c
+++ b/source/nmbd/nmbd_incomingrequests.c
@@ -364,7 +364,7 @@ subnet %s - name not found.\n", nmb_namestr(&nmb->question.question_name),
         /* Start with the name. */
         memset(buf,'\0',18);
         slprintf(buf, 17, "%-15.15s",namerec->name.name);
-        strupper(buf);
+        strupper_m(buf);
         
         /* Put the name type and netbios flags in the buffer. */
         buf[15] = name_type;

diff --git a/source/nmbd/nmbd_namelistdb.c b/source/nmbd/nmbd_namelistdb.c
index 932d926a9198cb6924bd14952ef9f5a419c9245e..3f6d2f3b64358e43e402911bb36388a878ca237f 100644 (file)
--- a/source/nmbd/nmbd_namelistdb.c
+++ b/source/nmbd/nmbd_namelistdb.c
@@ -49,8 +49,8 @@ static void upcase_name( struct nmb_name *target, struct nmb_name *source )
   if( NULL != source )
     (void)memcpy( target, source, sizeof( struct nmb_name ) );
 
-  strupper( target->name );
-  strupper( target->scope );
+  strupper_m( target->name );
+  strupper_m( target->scope );
 
   /* fudge... We're using a byte-by-byte compare, so we must be sure that
    * unused space doesn't have garbage in it.

diff --git a/source/nmbd/nmbd_sendannounce.c b/source/nmbd/nmbd_sendannounce.c
index 8501acf9ba51ae16a1e6cf5364ba8a99d797887b..353717ee623f14f0c6bb660b348b5cd860c64cf3 100644 (file)
--- a/source/nmbd/nmbd_sendannounce.c
+++ b/source/nmbd/nmbd_sendannounce.c
@@ -142,7 +142,7 @@ static void send_lm_announcement(struct subnet_record *subrec, int announce_type
 
   p += 10;
   /*StrnCpy(p,server_name,15);
-  strupper(p);
+  strupper_m(p);
   p = skip_string(p,1);
   pstrcpy(p,server_comment);
   p = skip_string(p,1);*/
@@ -591,7 +591,7 @@ for workgroup %s on subnet %s.\n", lp_workgroup(), FIRST_SUBNET->subnet_name ));
   p++;
 
   fstrcpy(myname, global_myname());
-  strupper(myname);
+  strupper_m(myname);
   myname[15]='\0';
   push_pstring_base(p, myname, outbuf);
 

diff --git a/source/nmbd/nmbd_serverlistdb.c b/source/nmbd/nmbd_serverlistdb.c
index e99599e16faa20827d0de5ff4358b21ea62b22e2..2484a7f830b630b21b4509251e43ed9258a2ff51 100644 (file)
--- a/source/nmbd/nmbd_serverlistdb.c
+++ b/source/nmbd/nmbd_serverlistdb.c
@@ -155,7 +155,7 @@ workgroup %s. This is a bug.\n", name, work->work_group));
  
   fstrcpy(servrec->serv.name,name);
   fstrcpy(servrec->serv.comment,comment);
-  strupper(servrec->serv.name);
+  strupper_m(servrec->serv.name);
   servrec->serv.type  = servertype;
 
   update_server_ttl(servrec, ttl);

diff --git a/source/nsswitch/wbinfo.c b/source/nsswitch/wbinfo.c
index 75e1d825ce53befec335b85495e04709475c5c3b..f880f77e90db894a5a71eefa83817db2abf2c522 100644 (file)
--- a/source/nsswitch/wbinfo.c
+++ b/source/nsswitch/wbinfo.c
@@ -103,7 +103,7 @@ static BOOL parse_wbinfo_domain_user(const char *domuser, fstring domain,
        fstrcpy(user, p+1);
        fstrcpy(domain, domuser);
        domain[PTR_DIFF(p, domuser)] = 0;
-       strupper(domain);
+       strupper_m(domain);
 
        return True;
 }

diff --git a/source/nsswitch/winbindd_ads.c b/source/nsswitch/winbindd_ads.c
index 1bb608b5bf3b28ca7c9be4db0a785dcdad2d5b2c..462dd21531bf0428361f449110dff1a6d3dc245a 100644 (file)
--- a/source/nsswitch/winbindd_ads.c
+++ b/source/nsswitch/winbindd_ads.c
@@ -875,8 +875,8 @@ static NTSTATUS alternate_name(struct winbindd_domain *domain)
        if (ADS_ERR_OK(rc)) {
                fstrcpy(domain->name, workgroup);
                fstrcpy(domain->alt_name, ads->config.realm);
-               strupper(domain->alt_name);
-               strupper(domain->name);
+               strupper_m(domain->alt_name);
+               strupper_m(domain->name);
        }
 
        talloc_destroy(ctx);

diff --git a/source/nsswitch/winbindd_cache.c b/source/nsswitch/winbindd_cache.c
index eb7170ff6077a57e64723079d26d0d884904437d..9163c97c95e1402dfd3b79d49d5f697aacaa0ebf 100644 (file)
--- a/source/nsswitch/winbindd_cache.c
+++ b/source/nsswitch/winbindd_cache.c
@@ -595,7 +595,7 @@ static void wcache_save_name_to_sid(struct winbindd_domain *domain,
                return;
        centry_put_sid(centry, sid);
        fstrcpy(uname, name);
-       strupper(uname);
+       strupper_m(uname);
        centry_end(centry, "NS/%s", sid_to_string(sid_string, sid));
        DEBUG(10,("wcache_save_name_to_sid: %s -> %s\n", uname, sid_string));
        centry_free(centry);
@@ -918,7 +918,7 @@ static NTSTATUS name_to_sid(struct winbindd_domain *domain,
                goto do_query;
 
        fstrcpy(uname, name);
-       strupper(uname);
+       strupper_m(uname);
        centry = wcache_fetch(cache, domain, "NS/%s/%s", domain->name, uname);
        if (!centry)
                goto do_query;

diff --git a/source/nsswitch/winbindd_util.c b/source/nsswitch/winbindd_util.c
index 0bc4beeac6c272423eda097c989713d8659cdcec..28da415b9c3a7be91681835eb52ecb75802107c7 100644 (file)
--- a/source/nsswitch/winbindd_util.c
+++ b/source/nsswitch/winbindd_util.c
@@ -426,7 +426,7 @@ BOOL parse_domain_user(const char *domuser, fstring domain, fstring user)
                fstrcpy(domain, domuser);
                domain[PTR_DIFF(p, domuser)] = 0;
        }
-       strupper(domain);
+       strupper_m(domain);
        return True;
 }
 

diff --git a/source/param/loadparm.c b/source/param/loadparm.c
index d6e24dfc3c6e7f962411dd862b6c5e5d403b0c3c..1085a2d17576141464cf530373dd9b32bd81324b 100644 (file)
--- a/source/param/loadparm.c
+++ b/source/param/loadparm.c
@@ -2478,7 +2478,7 @@ static void copy_service(service * pserviceDest, service * pserviceSource, BOOL
                                case P_USTRING:
                                        string_set(dest_ptr,
                                                   *(char **)src_ptr);
-                                       strupper(*(char **)dest_ptr);
+                                       strupper_m(*(char **)dest_ptr);
                                        break;
                                case P_LIST:
                                        str_list_copy((char ***)dest_ptr, *(const char ***)src_ptr);
@@ -3175,7 +3175,7 @@ BOOL lp_do_parameter(int snum, const char *pszParmName, const char *pszParmValue
 
                case P_USTRING:
                        string_set(parm_ptr, pszParmValue);
-                       strupper(*(char **)parm_ptr);
+                       strupper_m(*(char **)parm_ptr);
                        break;
 
                case P_GSTRING:
@@ -3184,7 +3184,7 @@ BOOL lp_do_parameter(int snum, const char *pszParmName, const char *pszParmValue
 
                case P_UGSTRING:
                        pstrcpy((char *)parm_ptr, pszParmValue);
-                       strupper((char *)parm_ptr);
+                       strupper_m((char *)parm_ptr);
                        break;
 
                case P_ENUM:

diff --git a/source/passdb/pdb_tdb.c b/source/passdb/pdb_tdb.c
index 2cf7a0119f3b072e5e9fb1b9fd2da3da995ecf09..77473fe0dc16e03393c68b829d4339692705fdd0 100644 (file)
--- a/source/passdb/pdb_tdb.c
+++ b/source/passdb/pdb_tdb.c
@@ -576,7 +576,7 @@ static NTSTATUS tdbsam_getsampwnam (struct pdb_methods *my_methods, SAM_ACCOUNT
        
        /* Data is stored in all lower-case */
        fstrcpy(name, sname);
-       strlower(name);
+       strlower_m(name);
 
        /* set search key */
        slprintf(keystr, sizeof(keystr)-1, "%s%s", USERPREFIX, name);
@@ -683,7 +683,7 @@ static NTSTATUS tdbsam_delete_sam_account(struct pdb_methods *my_methods, SAM_AC
        fstring         name;
        
        fstrcpy(name, pdb_get_username(sam_pass));
-       strlower(name);
+       strlower_m(name);
        
        /* open the TDB */
        if (!(pwd_tdb = tdb_open_log(tdb_state->tdbsam_location, 0, TDB_DEFAULT, O_RDWR, 0600))) {
@@ -804,7 +804,7 @@ static BOOL tdb_update_sam(struct pdb_methods *my_methods, SAM_ACCOUNT* newpwd,
        data.dptr = buf;
 
        fstrcpy(name, pdb_get_username(newpwd));
-       strlower(name);
+       strlower_m(name);
        
        DEBUG(5, ("Storing %saccount %s with RID %d\n", flag == TDB_INSERT ? "(new) " : "", name, user_rid));
 

diff --git a/source/passdb/secrets.c b/source/passdb/secrets.c
index c039fe53b429922d3921861b57e09246089f079c..bad8e96865c2327ed434f8b8cec0e106020f2062 100644 (file)
--- a/source/passdb/secrets.c
+++ b/source/passdb/secrets.c
@@ -100,7 +100,7 @@ BOOL secrets_store_domain_sid(const char *domain, const DOM_SID *sid)
        fstring key;
 
        slprintf(key, sizeof(key)-1, "%s/%s", SECRETS_DOMAIN_SID, domain);
-       strupper(key);
+       strupper_m(key);
        return secrets_store(key, sid, sizeof(DOM_SID));
 }
 
@@ -111,7 +111,7 @@ BOOL secrets_fetch_domain_sid(const char *domain, DOM_SID *sid)
        size_t size;
 
        slprintf(key, sizeof(key)-1, "%s/%s", SECRETS_DOMAIN_SID, domain);
-       strupper(key);
+       strupper_m(key);
        dyn_sid = (DOM_SID *)secrets_fetch(key, &size);
 
        if (dyn_sid == NULL)
@@ -133,7 +133,7 @@ BOOL secrets_store_domain_guid(const char *domain, GUID *guid)
        fstring key;
 
        slprintf(key, sizeof(key)-1, "%s/%s", SECRETS_DOMAIN_GUID, domain);
-       strupper(key);
+       strupper_m(key);
        return secrets_store(key, guid, sizeof(GUID));
 }
 
@@ -145,7 +145,7 @@ BOOL secrets_fetch_domain_guid(const char *domain, GUID *guid)
        GUID new_guid;
 
        slprintf(key, sizeof(key)-1, "%s/%s", SECRETS_DOMAIN_GUID, domain);
-       strupper(key);
+       strupper_m(key);
        dyn_guid = (GUID *)secrets_fetch(key, &size);
 
        DEBUG(6,("key is %s, size is %d\n", key, (int)size));
@@ -183,7 +183,7 @@ const char *trust_keystr(const char *domain)
 
        slprintf(keystr,sizeof(keystr)-1,"%s/%s", 
                 SECRETS_MACHINE_ACCT_PASS, domain);
-       strupper(keystr);
+       strupper_m(keystr);
 
        return keystr;
 }
@@ -200,7 +200,7 @@ char *trustdom_keystr(const char *domain)
        static char* keystr;
 
        asprintf(&keystr, "%s/%s", SECRETS_DOMTRUST_ACCT_PASS, domain);
-       strupper(keystr);
+       strupper_m(keystr);
                
        return keystr;
 }
@@ -399,7 +399,7 @@ BOOL secrets_store_machine_password(const char *pass, const char *domain, uint32
        asprintf(&key, "%s/%s", SECRETS_MACHINE_PASSWORD, domain);
        if (!key) 
                return False;
-       strupper(key);
+       strupper_m(key);
 
        ret = secrets_store(key, pass, strlen(pass)+1);
        SAFE_FREE(key);
@@ -410,7 +410,7 @@ BOOL secrets_store_machine_password(const char *pass, const char *domain, uint32
        asprintf(&key, "%s/%s", SECRETS_MACHINE_LAST_CHANGE_TIME, domain);
        if (!key) 
                return False;
-       strupper(key);
+       strupper_m(key);
 
        SIVAL(&last_change_time, 0, time(NULL));
        ret = secrets_store(key, &last_change_time, sizeof(last_change_time));
@@ -419,7 +419,7 @@ BOOL secrets_store_machine_password(const char *pass, const char *domain, uint32
        asprintf(&key, "%s/%s", SECRETS_MACHINE_SEC_CHANNEL_TYPE, domain);
        if (!key) 
                return False;
-       strupper(key);
+       strupper_m(key);
 
        SIVAL(&sec_channel_type, 0, sec_channel);
        ret = secrets_store(key, &sec_channel_type, sizeof(sec_channel_type));
@@ -440,7 +440,7 @@ char *secrets_fetch_machine_password(const char *domain,
        char *key = NULL;
        char *ret;
        asprintf(&key, "%s/%s", SECRETS_MACHINE_PASSWORD, domain);
-       strupper(key);
+       strupper_m(key);
        ret = (char *)secrets_fetch(key, NULL);
        SAFE_FREE(key);
        
@@ -448,7 +448,7 @@ char *secrets_fetch_machine_password(const char *domain,
                size_t size;
                uint32 *last_set_time;
                asprintf(&key, "%s/%s", SECRETS_MACHINE_LAST_CHANGE_TIME, domain);
-               strupper(key);
+               strupper_m(key);
                last_set_time = secrets_fetch(key, &size);
                if (last_set_time) {
                        *pass_last_set_time = IVAL(last_set_time,0);
@@ -463,7 +463,7 @@ char *secrets_fetch_machine_password(const char *domain,
                size_t size;
                uint32 *channel_type;
                asprintf(&key, "%s/%s", SECRETS_MACHINE_SEC_CHANNEL_TYPE, domain);
-               strupper(key);
+               strupper_m(key);
                channel_type = secrets_fetch(key, &size);
                if (channel_type) {
                        *channel = IVAL(channel_type,0);

diff --git a/source/printing/lpq_parse.c b/source/printing/lpq_parse.c
index b2f45ad36627570bc52b8d969018f42b1ae4bb29..0acca67b7044aa470a2ec32b1b0c82db65313f20 100644 (file)
--- a/source/printing/lpq_parse.c
+++ b/source/printing/lpq_parse.c
@@ -984,7 +984,7 @@ BOOL parse_lpq_entry(int snum,char *line,
          printer status line: 
         handle them so that most severe condition is shown */
       int i;
-      strlower(line);
+      strlower_m(line);
       
       switch (status->status) {
       case LPSTAT_OK:

diff --git a/source/rpc_client/cli_pipe.c b/source/rpc_client/cli_pipe.c
index a6a49dd3ebea206d967f692bea8a37928ff18c10..5fb0205bfac1879c983edae1bf140607e7c8e70c 100644 (file)
--- a/source/rpc_client/cli_pipe.c
+++ b/source/rpc_client/cli_pipe.c
@@ -1570,15 +1570,15 @@ BOOL cli_nt_session_open(struct cli_state *cli, const int pipe_idx)
 
        fstrcpy(cli->srv_name_slash, "\\\\");
        fstrcat(cli->srv_name_slash, cli->desthost);
-       strupper(cli->srv_name_slash);
+       strupper_m(cli->srv_name_slash);
 
        fstrcpy(cli->clnt_name_slash, "\\\\");
        fstrcat(cli->clnt_name_slash, global_myname());
-       strupper(cli->clnt_name_slash);
+       strupper_m(cli->clnt_name_slash);
 
        fstrcpy(cli->mach_acct, global_myname());
        fstrcat(cli->mach_acct, "$");
-       strupper(cli->mach_acct);
+       strupper_m(cli->mach_acct);
 
        /* Remember which pipe we're talking to */
        fstrcpy(cli->pipe_name, pipe_names[pipe_idx].client_pipe);

diff --git a/source/rpc_client/cli_spoolss.c b/source/rpc_client/cli_spoolss.c
index bb6ce1b998547eb624dd81f4f58f48293ca40726..63926204978d8af19b788172de4d1d16e26c7dcc 100644 (file)
--- a/source/rpc_client/cli_spoolss.c
+++ b/source/rpc_client/cli_spoolss.c
@@ -511,8 +511,8 @@ WERROR cli_spoolss_enum_ports(struct cli_state *cli, TALLOC_CTX *mem_ctx,
        ZERO_STRUCT(q);
        ZERO_STRUCT(r);
 
-        slprintf (server, sizeof(fstring)-1, "\\\\%s", cli->desthost);
-        strupper (server);
+        slprintf(server, sizeof(fstring)-1, "\\\\%s", cli->desthost);
+        strupper_m(server);
 
        /* Initialise input parameters */
        
@@ -732,8 +732,8 @@ WERROR cli_spoolss_getprinterdriver(struct cli_state *cli,
        ZERO_STRUCT(q);
        ZERO_STRUCT(r);
 
-       fstrcpy (server, cli->desthost);
-       strupper (server);
+       fstrcpy(server, cli->desthost);
+       strupper_m(server);
 
        /* Initialise input parameters */
 
@@ -813,8 +813,8 @@ WERROR cli_spoolss_enumprinterdrivers (struct cli_state *cli,
        ZERO_STRUCT(q);
        ZERO_STRUCT(r);
 
-        slprintf (server, sizeof(fstring)-1, "\\\\%s", cli->desthost);
-        strupper (server);
+        slprintf(server, sizeof(fstring)-1, "\\\\%s", cli->desthost);
+        strupper_m(server);
 
        /* Initialise input parameters */
 
@@ -899,8 +899,8 @@ WERROR cli_spoolss_getprinterdriverdir (struct cli_state *cli,
        ZERO_STRUCT(q);
        ZERO_STRUCT(r);
 
-        slprintf (server, sizeof(fstring)-1, "\\\\%s", cli->desthost);
-        strupper (server);
+        slprintf(server, sizeof(fstring)-1, "\\\\%s", cli->desthost);
+        strupper_m(server);
 
        /* Initialise input parameters */
 
@@ -967,8 +967,8 @@ WERROR cli_spoolss_addprinterdriver (struct cli_state *cli,
        ZERO_STRUCT(q);
        ZERO_STRUCT(r);
        
-        slprintf (server, sizeof(fstring)-1, "\\\\%s", cli->desthost);
-        strupper (server);
+        slprintf(server, sizeof(fstring)-1, "\\\\%s", cli->desthost);
+        strupper_m(server);
 
        /* Initialise input parameters */
 
@@ -1021,10 +1021,10 @@ WERROR cli_spoolss_addprinterex (struct cli_state *cli, TALLOC_CTX *mem_ctx,
        ZERO_STRUCT(q);
        ZERO_STRUCT(r);
 
-        slprintf (client, sizeof(fstring)-1, "\\\\%s", cli->desthost);
-        strupper (client);
-        slprintf (server, sizeof(fstring)-1, "\\\\%s", cli->desthost);
-        strupper (server);
+        slprintf(client, sizeof(fstring)-1, "\\\\%s", cli->desthost);
+        strupper_m(client);
+        slprintf(server, sizeof(fstring)-1, "\\\\%s", cli->desthost);
+        strupper_m(server);
        fstrcpy  (user, cli->user_name);
 
        /* Initialise input parameters */
@@ -1084,8 +1084,8 @@ WERROR cli_spoolss_deleteprinterdriver (struct cli_state *cli,
        prs_init(&qbuf, MAX_PDU_FRAG_LEN, mem_ctx, MARSHALL);
        prs_init(&rbuf, 0, mem_ctx, UNMARSHALL);
 
-        slprintf (server, sizeof(fstring)-1, "\\\\%s", cli->desthost);
-        strupper (server);
+        slprintf(server, sizeof(fstring)-1, "\\\\%s", cli->desthost);
+        strupper_m(server);
 
        /* Write the request */
 

diff --git a/source/rpc_parse/parse_net.c b/source/rpc_parse/parse_net.c
index f977549a0709fcd9db239cac03fc7052e32197c0..804da707dedc4f01dd422091656860670de5e8c6 100644 (file)
--- a/source/rpc_parse/parse_net.c
+++ b/source/rpc_parse/parse_net.c
@@ -446,7 +446,7 @@ void init_r_trust_dom(NET_R_TRUST_DOM_LIST *r_t,
        for (i = 0; i < num_doms; i++) {
                fstring domain_name;
                fstrcpy(domain_name, dom_name);
-               strupper(domain_name);
+               strupper_m(domain_name);
                init_unistr2(&r_t->uni_trust_dom_name[i], domain_name, strlen(domain_name)+1);
                /* the use of UNISTR2 here is non-standard. */
                r_t->uni_trust_dom_name[i].undoc = 0x1;

diff --git a/source/rpc_server/srv_dfs_nt.c b/source/rpc_server/srv_dfs_nt.c
index da92e5c06b5adb22ecc7dd4a8092ccfc2e65de34..eba4eaec756f9bc4761ef8bb43189c456fe7b4bd 100644 (file)
--- a/source/rpc_server/srv_dfs_nt.c
+++ b/source/rpc_server/srv_dfs_nt.c
@@ -135,7 +135,7 @@ WERROR _dfs_remove(pipes_struct *p, DFS_Q_DFS_REMOVE *q_u,
       pstrcpy(altpath, servername);
       pstrcat(altpath, "\\");
       pstrcat(altpath, sharename);
-      strlower(altpath);
+      strlower_m(altpath);
     }
 
   DEBUG(5,("init_reply_dfs_remove: Request to remove %s -> %s\\%s.\n",

diff --git a/source/rpc_server/srv_lsa_nt.c b/source/rpc_server/srv_lsa_nt.c
index 93e97a7492926aca0345a8c9c57eba90e36eb091..ca3021a8762dc06c01e994ae8ee0199197465577 100644 (file)
--- a/source/rpc_server/srv_lsa_nt.c
+++ b/source/rpc_server/srv_lsa_nt.c
@@ -1249,7 +1249,7 @@ NTSTATUS _lsa_query_info2(pipes_struct *p, LSA_Q_QUERY_INFO2 *q_u, LSA_R_QUERY_I
                                /* This should be a 'netbios domain -> DNS domain' mapping */
                                dnsdomname[0] = '\0';
                                get_mydomname(dnsdomname);
-                               strlower(dnsdomname);
+                               strlower_m(dnsdomname);
                                
                                dns_name = dnsdomname;
                                forest_name = dnsdomname;

diff --git a/source/rpc_server/srv_samr_nt.c b/source/rpc_server/srv_samr_nt.c
index ebf483da660a2421270641ba9e0f2b632c9379de..c475260cca17344329d4dffe4e4416e5633d161d 100644 (file)
--- a/source/rpc_server/srv_samr_nt.c
+++ b/source/rpc_server/srv_samr_nt.c
@@ -2225,7 +2225,7 @@ NTSTATUS _api_samr_create_user(pipes_struct *p, SAMR_Q_CREATE_USER *q_u, SAMR_R_
         */
 
        rpcstr_pull(account, user_account.buffer, sizeof(account), user_account.uni_str_len*2, 0);
-       strlower(account);
+       strlower_m(account);
 
        pdb_init_sam(&sam_pass);
 
@@ -2578,7 +2578,7 @@ NTSTATUS _samr_enum_domains(pipes_struct *p, SAMR_Q_ENUM_DOMAINS *q_u, SAMR_R_EN
        name = get_global_sam_name();
 
        fstrcpy(dom[0],name);
-       strupper(dom[0]);
+       strupper_m(dom[0]);
        fstrcpy(dom[1],"Builtin");
 
        if (!make_enum_domains(p->mem_ctx, &r_u->sam, &r_u->uni_dom_name, num_entries, dom))

diff --git a/source/rpc_server/srv_spoolss_nt.c b/source/rpc_server/srv_spoolss_nt.c
index deca2ad8bb4ad5c95a91cefd65a91afb102ae909..2b68e34b2d880874e47a47b3d3a2cbc9dd4570ef 100644 (file)
--- a/source/rpc_server/srv_spoolss_nt.c
+++ b/source/rpc_server/srv_spoolss_nt.c
@@ -4339,7 +4339,7 @@ static BOOL construct_printer_info_7(Printer_entry *print_hnd, PRINTER_INFO_7 *p
        
        if (is_printer_published(print_hnd, snum, &guid)) {
                asprintf(&guid_str, "{%s}", smb_uuid_string_static(guid));
-               strupper(guid_str);
+               strupper_m(guid_str);
                init_unistr(&printer->guid, guid_str);
                printer->action = SPOOL_DS_PUBLISH;
        } else {
@@ -4689,7 +4689,7 @@ WERROR _spoolss_enumprinters( pipes_struct *p, SPOOL_Q_ENUMPRINTERS *q_u, SPOOL_
         */
 
        unistr2_to_ascii(name, servername, sizeof(name)-1);
-       strupper(name);
+       strupper_m(name);
 
        switch (level) {
        case 1:

diff --git a/source/rpc_server/srv_wkssvc_nt.c b/source/rpc_server/srv_wkssvc_nt.c
index bda7b14a422c6d31fb25d55ae571d2d1c1ad96e8..25fa029237da8409e25eebf4d54831be32b6215f 100644 (file)
--- a/source/rpc_server/srv_wkssvc_nt.c
+++ b/source/rpc_server/srv_wkssvc_nt.c
@@ -40,10 +40,10 @@ static void create_wks_info_100(WKS_INFO_100 *inf)
        DEBUG(5,("create_wks_info_100: %d\n", __LINE__));
 
        pstrcpy (my_name, global_myname());
-       strupper(my_name);
+       strupper_m(my_name);
 
        pstrcpy (domain, lp_workgroup());
-       strupper(domain);
+       strupper_m(domain);
 
        init_wks_info_100(inf,
                          0x000001f4, /* platform id info */

diff --git a/source/rpcclient/cmd_samr.c b/source/rpcclient/cmd_samr.c
index e2232f0da77a078fe8e016bf2dce2cd072e36212..40d01d0f5a2383f95a80cd4196b5c558175708bc 100644 (file)
--- a/source/rpcclient/cmd_samr.c
+++ b/source/rpcclient/cmd_samr.c
@@ -288,8 +288,8 @@ static NTSTATUS cmd_samr_query_user(struct cli_state *cli,
                sscanf(argv[3], "%x", &access_mask);
        
 
-       slprintf (server, sizeof(fstring)-1, "\\\\%s", cli->desthost);
-       strupper (server);
+       slprintf(server, sizeof(fstring)-1, "\\\\%s", cli->desthost);
+       strupper_m(server);
        
        result = try_samr_connects(cli, mem_ctx, MAXIMUM_ALLOWED_ACCESS,
                                   &connect_pol);
@@ -396,8 +396,8 @@ static NTSTATUS cmd_samr_query_group(struct cli_state *cli,
        if (argc > 3)
                sscanf(argv[3], "%x", &access_mask);
 
-       slprintf (server, sizeof(fstring)-1, "\\\\%s", cli->desthost);
-       strupper (server);
+       slprintf(server, sizeof(fstring)-1, "\\\\%s", cli->desthost);
+       strupper_m(server);
 
        result = try_samr_connects(cli, mem_ctx, MAXIMUM_ALLOWED_ACCESS,
                                   &connect_pol);
@@ -458,8 +458,8 @@ static NTSTATUS cmd_samr_query_usergroups(struct cli_state *cli,
        if (argc > 2)
                sscanf(argv[2], "%x", &access_mask);
 
-       slprintf (server, sizeof(fstring)-1, "\\\\%s", cli->desthost);
-       strupper (server);
+       slprintf(server, sizeof(fstring)-1, "\\\\%s", cli->desthost);
+       strupper_m(server);
                
        result = try_samr_connects(cli, mem_ctx, MAXIMUM_ALLOWED_ACCESS,
                                   &connect_pol);
@@ -524,8 +524,8 @@ static NTSTATUS cmd_samr_query_useraliases(struct cli_state *cli,
        if (argc > 3)
                sscanf(argv[3], "%x", &access_mask);
 
-       slprintf (server, sizeof(fstring)-1, "\\\\%s", cli->desthost);
-       strupper (server);
+       slprintf(server, sizeof(fstring)-1, "\\\\%s", cli->desthost);
+       strupper_m(server);
                
        result = try_samr_connects(cli, mem_ctx, MAXIMUM_ALLOWED_ACCESS,
                                   &connect_pol);
@@ -587,8 +587,8 @@ static NTSTATUS cmd_samr_query_groupmem(struct cli_state *cli,
        if (argc > 2)
                sscanf(argv[2], "%x", &access_mask);
 
-       slprintf (server, sizeof(fstring)-1, "\\\\%s", cli->desthost);
-       strupper (server);
+       slprintf(server, sizeof(fstring)-1, "\\\\%s", cli->desthost);
+       strupper_m(server);
 
        result = try_samr_connects(cli, mem_ctx, MAXIMUM_ALLOWED_ACCESS,
                                   &connect_pol);
@@ -1415,8 +1415,8 @@ static NTSTATUS cmd_samr_query_sec_obj(struct cli_state *cli,
                        sscanf(argv[1], "%i", &user_rid);
        }
        
-       slprintf (server, sizeof(fstring)-1, "\\\\%s", cli->desthost);
-       strupper (server);
+       slprintf(server, sizeof(fstring)-1, "\\\\%s", cli->desthost);
+       strupper_m(server);
        result = try_samr_connects(cli, mem_ctx, MAXIMUM_ALLOWED_ACCESS,
                                   &connect_pol);
 

diff --git a/source/rpcclient/cmd_spoolss.c b/source/rpcclient/cmd_spoolss.c
index 96a4b890aed8641905d9d5335498d13ce0984d4f..b2fa802e9a38796d3f664c619e12c3811efc1169 100644 (file)
--- a/source/rpcclient/cmd_spoolss.c
+++ b/source/rpcclient/cmd_spoolss.c
@@ -112,10 +112,10 @@ static WERROR cmd_spoolss_open_printer_ex(struct cli_state *cli,
        if (!cli)
             return WERR_GENERAL_FAILURE;
 
-       slprintf (servername, sizeof(servername)-1, "\\\\%s", cli->desthost);
-       strupper (servername);
-       fstrcpy  (user, cli->user_name);
-       fstrcpy  (printername, argv[1]);
+       slprintf(servername, sizeof(servername)-1, "\\\\%s", cli->desthost);
+       strupper_m(servername);
+       fstrcpy(user, cli->user_name);
+       fstrcpy(printername, argv[1]);
 
        /* Open the printer handle */
 
@@ -320,7 +320,7 @@ static WERROR cmd_spoolss_enum_printers(struct cli_state *cli,
                fstrcpy(name, argv[2]);
        else {
                slprintf(name, sizeof(name)-1, "\\\\%s", cli->desthost);
-               strupper(name);
+               strupper_m(name);
        }
 
        /* Enumerate printers  -- Should we enumerate types other 
@@ -480,10 +480,10 @@ static WERROR cmd_spoolss_setprinter(struct cli_state *cli,
                fstrcpy(comment, argv[2]);
        }
 
-       slprintf (servername, sizeof(servername)-1, "\\\\%s", cli->desthost);
-       strupper (servername);
-       fstrcpy (printername, argv[1]);
-       fstrcpy  (user, cli->user_name);
+       slprintf(servername, sizeof(servername)-1, "\\\\%s", cli->desthost);
+       strupper_m(servername);
+       fstrcpy(printername, argv[1]);
+       fstrcpy(user, cli->user_name);
 
        /* get a printer handle */
        result = cli_spoolss_open_printer_ex(cli, mem_ctx, printername, "", 
@@ -548,10 +548,10 @@ static WERROR cmd_spoolss_getprinter(struct cli_state *cli,
                info_level = atoi(argv[2]);
        }
 
-       slprintf (servername, sizeof(servername)-1, "\\\\%s", cli->desthost);
-       strupper (servername);
-       slprintf (printername, sizeof(printername)-1, "%s\\%s", servername, argv[1]);
-       fstrcpy  (user, cli->user_name);
+       slprintf(servername, sizeof(servername)-1, "\\\\%s", cli->desthost);
+       strupper_m(servername);
+       slprintf(printername, sizeof(printername)-1, "%s\\%s", servername, argv[1]);
+       fstrcpy(user, cli->user_name);
        
        /* get a printer handle */
 
@@ -666,14 +666,14 @@ static WERROR cmd_spoolss_getprinterdata(struct cli_state *cli,
 
        /* Open a printer handle */
 
-       slprintf (servername, sizeof(servername)-1, "\\\\%s", cli->desthost);
-       strupper (servername);
+       slprintf(servername, sizeof(servername)-1, "\\\\%s", cli->desthost);
+       strupper_m(servername);
        if (strncmp(argv[1], ".", sizeof(".")) == 0)
                fstrcpy(printername, servername);
        else
-               slprintf (printername, sizeof(servername)-1, "%s\\%s", 
+               slprintf(printername, sizeof(servername)-1, "%s\\%s", 
                          servername, argv[1]);
-       fstrcpy  (user, cli->user_name);
+       fstrcpy(user, cli->user_name);
        
        /* get a printer handle */
 
@@ -739,14 +739,14 @@ static WERROR cmd_spoolss_getprinterdataex(struct cli_state *cli,
 
        /* Open a printer handle */
 
-       slprintf (servername, sizeof(servername)-1, "\\\\%s", cli->desthost);
-       strupper (servername);
+       slprintf(servername, sizeof(servername)-1, "\\\\%s", cli->desthost);
+       strupper_m(servername);
        if (strncmp(argv[1], ".", sizeof(".")) == 0)
                fstrcpy(printername, servername);
        else
-               slprintf (printername, sizeof(printername)-1, "%s\\%s", 
+               slprintf(printername, sizeof(printername)-1, "%s\\%s", 
                          servername, argv[1]);
-       fstrcpy  (user, cli->user_name);
+       fstrcpy(user, cli->user_name);
        
        /* get a printer handle */
 
@@ -920,10 +920,10 @@ static WERROR cmd_spoolss_getdriver(struct cli_state *cli,
        }
 
        /* get the arguments need to open the printer handle */
-       slprintf (servername, sizeof(servername)-1, "\\\\%s", cli->desthost);
-       strupper (servername);
-       fstrcpy  (user, cli->user_name);
-       fstrcpy  (printername, argv[1]);
+       slprintf(servername, sizeof(servername)-1, "\\\\%s", cli->desthost);
+       strupper_m(servername);
+       fstrcpy(user, cli->user_name);
+       fstrcpy(printername, argv[1]);
        if (argc == 3)
                info_level = atoi(argv[2]);
 
@@ -1288,8 +1288,8 @@ static WERROR cmd_spoolss_addprinterex(struct cli_state *cli,
                return WERR_OK;
         }
        
-        slprintf (servername, sizeof(servername)-1, "\\\\%s", cli->desthost);
-        strupper (servername);
+        slprintf(servername, sizeof(servername)-1, "\\\\%s", cli->desthost);
+        strupper_m(servername);
 
        /* Fill in the DRIVER_INFO_3 struct */
        ZERO_STRUCT(info2);
@@ -1350,10 +1350,10 @@ static WERROR cmd_spoolss_setdriver(struct cli_state *cli,
                return WERR_OK;
         }
 
-       slprintf (servername, sizeof(servername)-1, "\\\\%s", cli->desthost);
-       strupper (servername);
-       slprintf (printername, sizeof(printername)-1, "%s\\%s", servername, argv[1]);
-       fstrcpy  (user, cli->user_name);
+       slprintf(servername, sizeof(servername)-1, "\\\\%s", cli->desthost);
+       strupper_m(servername);
+       slprintf(printername, sizeof(printername)-1, "%s\\%s", servername, argv[1]);
+       fstrcpy(user, cli->user_name);
 
        /* Get a printer handle */
 
@@ -1421,8 +1421,8 @@ static WERROR cmd_spoolss_deletedriver(struct cli_state *cli,
                return WERR_OK;
         }
 
-       slprintf (servername, sizeof(servername)-1, "\\\\%s", cli->desthost);
-       strupper (servername);
+       slprintf(servername, sizeof(servername)-1, "\\\\%s", cli->desthost);
+       strupper_m(servername);
 
        /* delete the driver for all architectures */
        for (i=0; archi_table[i].long_archi; i++)
@@ -1465,7 +1465,7 @@ static WERROR cmd_spoolss_getprintprocdir(struct cli_state *cli,
 
        if (asprintf(&servername, "\\\\%s", cli->desthost) < 0)
                return WERR_NOMEM;
-       strupper(servername);
+       strupper_m(servername);
 
        if (asprintf(&environment, "%s", (argc == 2) ? argv[1] : 
                     PRINTER_DRIVER_ARCHITECTURE) < 0) {
@@ -1511,7 +1511,7 @@ static WERROR cmd_spoolss_addform(struct cli_state *cli, TALLOC_CTX *mem_ctx,
        /* Get a printer handle */
 
        asprintf(&servername, "\\\\%s", cli->desthost);
-       strupper(servername);
+       strupper_m(servername);
        asprintf(&printername, "%s\\%s", servername, argv[1]);
 
        werror = cli_spoolss_open_printer_ex(cli, mem_ctx, printername, "", 
@@ -1570,7 +1570,7 @@ static WERROR cmd_spoolss_setform(struct cli_state *cli, TALLOC_CTX *mem_ctx,
        /* Get a printer handle */
 
        asprintf(&servername, "\\\\%s", cli->desthost);
-       strupper(servername);
+       strupper_m(servername);
        asprintf(&printername, "%s\\%s", servername, argv[1]);
 
        werror = cli_spoolss_open_printer_ex(
@@ -1629,7 +1629,7 @@ static WERROR cmd_spoolss_getform(struct cli_state *cli, TALLOC_CTX *mem_ctx,
        /* Get a printer handle */
 
        asprintf(&servername, "\\\\%s", cli->desthost);
-       strupper(servername);
+       strupper_m(servername);
        asprintf(&printername, "%s\\%s", servername, argv[1]);
 
        werror = cli_spoolss_open_printer_ex(
@@ -1691,7 +1691,7 @@ static WERROR cmd_spoolss_deleteform(struct cli_state *cli,
        /* Get a printer handle */
 
        asprintf(&servername, "\\\\%s", cli->desthost);
-       strupper(servername);
+       strupper_m(servername);
        asprintf(&printername, "%s\\%s", servername, argv[1]);
 
        werror = cli_spoolss_open_printer_ex(
@@ -1740,7 +1740,7 @@ static WERROR cmd_spoolss_enum_forms(struct cli_state *cli,
        /* Get a printer handle */
 
        asprintf(&servername, "\\\\%s", cli->desthost);
-       strupper(servername);
+       strupper_m(servername);
        asprintf(&printername, "%s\\%s", servername, argv[1]);
 
        werror = cli_spoolss_open_printer_ex(
@@ -1806,10 +1806,10 @@ static WERROR cmd_spoolss_setprinterdata(struct cli_state *cli,
                return WERR_OK;
         }
 
-       slprintf (servername, sizeof(servername)-1, "\\\\%s", cli->desthost);
-       strupper (servername);
-       slprintf (printername, sizeof(servername)-1, "%s\\%s", servername, argv[1]);
-       fstrcpy  (user, cli->user_name);
+       slprintf(servername, sizeof(servername)-1, "\\\\%s", cli->desthost);
+       strupper_m(servername);
+       slprintf(printername, sizeof(servername)-1, "%s\\%s", servername, argv[1]);
+       fstrcpy(user, cli->user_name);
 
        /* get a printer handle */
        result = cli_spoolss_open_printer_ex(cli, mem_ctx, printername, "",
@@ -1929,10 +1929,10 @@ static WERROR cmd_spoolss_enum_jobs(struct cli_state *cli,
        /* Open printer handle */
 
        slprintf(servername, sizeof(servername)-1, "\\\\%s", cli->desthost);
-       strupper(servername);
+       strupper_m(servername);
        fstrcpy(user, cli->user_name);
        slprintf(printername, sizeof(servername)-1, "\\\\%s\\", cli->desthost);
-       strupper(printername);
+       strupper_m(printername);
        pstrcat(printername, argv[1]);
 
        result = cli_spoolss_open_printer_ex(cli, mem_ctx, printername, 
@@ -2000,10 +2000,10 @@ static WERROR cmd_spoolss_enum_data( struct cli_state *cli,
        /* Open printer handle */
 
        slprintf(servername, sizeof(servername)-1, "\\\\%s", cli->desthost);
-       strupper(servername);
+       strupper_m(servername);
        fstrcpy(user, cli->user_name);
        slprintf(printername, sizeof(printername)-1, "\\\\%s\\", cli->desthost);
-       strupper(printername);
+       strupper_m(printername);
        pstrcat(printername, argv[1]);
 
        result = cli_spoolss_open_printer_ex(cli, mem_ctx, printername, 
@@ -2063,10 +2063,10 @@ static WERROR cmd_spoolss_enum_data_ex( struct cli_state *cli,
        /* Open printer handle */
 
        slprintf(servername, sizeof(servername)-1, "\\\\%s", cli->desthost);
-       strupper(servername);
+       strupper_m(servername);
        fstrcpy(user, cli->user_name);
        slprintf(printername, sizeof(printername)-1, "\\\\%s\\", cli->desthost);
-       strupper(printername);
+       strupper_m(printername);
        pstrcat(printername, argv[1]);
 
        result = cli_spoolss_open_printer_ex(cli, mem_ctx, printername, 
@@ -2131,10 +2131,10 @@ static WERROR cmd_spoolss_enum_printerkey( struct cli_state *cli,
        /* Open printer handle */
 
        slprintf(servername, sizeof(servername)-1, "\\\\%s", cli->desthost);
-       strupper(servername);
+       strupper_m(servername);
        fstrcpy(user, cli->user_name);
        slprintf(printername, sizeof(printername)-1, "\\\\%s\\", cli->desthost);
-       strupper(printername);
+       strupper_m(printername);
        pstrcat(printername, argv[1]);
 
        result = cli_spoolss_open_printer_ex(cli, mem_ctx, printername, 
@@ -2196,11 +2196,11 @@ static WERROR cmd_spoolss_rffpcnex(struct cli_state *cli,
        /* Open printer */
 
        slprintf(servername, sizeof(servername) - 1, "\\\\%s", cli->desthost);
-       strupper(servername);
+       strupper_m(servername);
 
        slprintf(printername, sizeof(printername) - 1, "\\\\%s\\%s", cli->desthost,
                 argv[1]);
-       strupper(printername);
+       strupper_m(printername);
 
        result = cli_spoolss_open_printer_ex(
                cli, mem_ctx, printername, "", MAXIMUM_ALLOWED_ACCESS, 
@@ -2239,7 +2239,7 @@ static WERROR cmd_spoolss_rffpcnex(struct cli_state *cli,
        /* Send rffpcnex */
 
        slprintf(servername, sizeof(servername) - 1, "\\\\%s", myhostname());
-       strupper(servername);
+       strupper_m(servername);
 
        result = cli_spoolss_rffpcnex(
                cli, mem_ctx, &hnd, 0, 0, servername, 123, &option);

diff --git a/source/smbd/lanman.c b/source/smbd/lanman.c
index 6976a066846ad6e53dd4339f085b8fbeace0112c..04d6a9a8a8eda52528253601dcb1ddd43abb8979 100644 (file)
--- a/source/smbd/lanman.c
+++ b/source/smbd/lanman.c
@@ -2367,7 +2367,7 @@ static BOOL api_NetWkstaGetInfo(connection_struct *conn,uint16 vuid, char *param
 
   SIVAL(p,0,PTR_DIFF(p2,*rdata)); /* host name */
   pstrcpy(p2,local_machine);
-  strupper(p2);
+  strupper_m(p2);
   p2 = skip_string(p2,1);
   p += 4;
 
@@ -2378,7 +2378,7 @@ static BOOL api_NetWkstaGetInfo(connection_struct *conn,uint16 vuid, char *param
 
   SIVAL(p,0,PTR_DIFF(p2,*rdata)); /* login domain */
   pstrcpy(p2,lp_workgroup());
-  strupper(p2);
+  strupper_m(p2);
   p2 = skip_string(p2,1);
   p += 4;
 
@@ -2788,7 +2788,7 @@ static BOOL api_WWkstaUserLogon(connection_struct *conn,uint16 vuid, char *param
       fstring mypath;
       fstrcpy(mypath,"\\\\");
       fstrcat(mypath,local_machine);
-      strupper(mypath);
+      strupper_m(mypath);
       PACKS(&desc,"z",mypath); /* computer */
     }
     PACKS(&desc,"z",lp_workgroup());/* domain */
@@ -3007,7 +3007,7 @@ static void fill_printdest_info(connection_struct *conn, int snum, int uLevel,
   char buf[100];
   strncpy(buf,SERVICE(snum),sizeof(buf)-1);
   buf[sizeof(buf)-1] = 0;
-  strupper(buf);
+  strupper_m(buf);
   if (uLevel <= 1) {
     PACKS(desc,"B9",buf);      /* szName */
     if (uLevel == 1) {

diff --git a/source/smbd/mangle_hash.c b/source/smbd/mangle_hash.c
index d4cf369f28765cd2c74d0495a33183d9b737d26c..ac8e425fd3960563a60c09be188036b6c7bde057 100644 (file)
--- a/source/smbd/mangle_hash.c
+++ b/source/smbd/mangle_hash.c
@@ -227,7 +227,8 @@ static NTSTATUS is_valid_name(const smb_ucs2_t *fname, BOOL allow_wildcards)
                SAFE_FREE(str);
                return NT_STATUS_UNSUCCESSFUL;
        }
-       if (p) *p = 0;
+       if (p)
+               *p = 0;
        strupper_w(str);
        p = &(str[1]);
 
@@ -660,7 +661,7 @@ static void to_8_3(char *s)
        } else
                csum = str_checksum(s);
 
-       strupper( s );
+       strupper_m( s );
 
        if( p ) {
                if( p == s )

diff --git a/source/smbd/negprot.c b/source/smbd/negprot.c
index 2a2ca25532b8eebc16392f51551287081a2d6eca..f452dd845b634476a04ec02837b15710914f4b39 100644 (file)
--- a/source/smbd/negprot.c
+++ b/source/smbd/negprot.c
@@ -192,7 +192,7 @@ static int negprot_spnego(char *p)
        }
 #endif
 
-       strlower((char *)guid);
+       strlower_m((char *)guid);
 
 #if 0
        /* strangely enough, NT does not sent the single OID NTLMSSP when

diff --git a/source/smbd/open.c b/source/smbd/open.c
index 15171ce9e3d8110d805b36f345aafdbe917b9ba1..85d115a3bf4fe7552dbce18addeae271da7ef696 100644 (file)
--- a/source/smbd/open.c
+++ b/source/smbd/open.c
@@ -74,7 +74,7 @@ static void check_for_pipe(char *fname)
        /* special case of pipe opens */
        char s[10];
        StrnCpy(s,fname,sizeof(s)-1);
-       strlower(s);
+       strlower_m(s);
        if (strstr(s,"pipe/")) {
                DEBUG(3,("Rejecting named pipe open for %s\n",fname));
                unix_ERR_class = ERRSRV;

diff --git a/source/smbd/service.c b/source/smbd/service.c
index 11659f287063728a186a45f33b76a7692e0f33ba..6a23e38bbd1460ca5e117a356e0df2b1c50d8e63 100644 (file)
--- a/source/smbd/service.c
+++ b/source/smbd/service.c
@@ -237,7 +237,7 @@ static NTSTATUS share_sanity_checks(int snum, fstring dev)
                }
        }
 
-       strupper(dev);
+       strupper_m(dev);
 
        if (lp_print_ok(snum)) {
                if (!strequal(dev, "LPT1:")) {
@@ -828,7 +828,7 @@ connection_struct *make_connection(const char *service_in, DATA_BLOB password,
        
        fstrcpy(service, service_in);
 
-       strlower(service);
+       strlower_m(service);
 
        snum = find_service(service);
 

diff --git a/source/smbd/statcache.c b/source/smbd/statcache.c
index 593df745cca6cc11889c73ada49307e4f5b76003..5d54a5c4ffe9d69c83d735b53547899c8d999bd1 100644 (file)
--- a/source/smbd/statcache.c
+++ b/source/smbd/statcache.c
@@ -112,7 +112,7 @@ void stat_cache_add( const char *full_orig_name, const char *orig_translated_pat
        }
 
        if(!case_sensitive)
-               strupper(original_path);
+               strupper_m(original_path);
 
        if (original_path_length != translated_path_length) {
                if (original_path_length < translated_path_length) {
@@ -221,7 +221,7 @@ BOOL stat_cache_lookup(connection_struct *conn, pstring name, pstring dirpath,
        pstrcpy(chk_name, name);
 
        if(!case_sensitive) {
-               strupper( chk_name );
+               strupper_m( chk_name );
                /*
                 * In some language encodings the length changes
                 * if we uppercase. We need to treat this differently

diff --git a/source/utils/net_ads.c b/source/utils/net_ads.c
index e97ab6fc2b53ff0a0333a0b6bfce09d6e91db0b4..69d282420d91acd7dd1af53f4f568ed6a209fad0 100644 (file)
--- a/source/utils/net_ads.c
+++ b/source/utils/net_ads.c
@@ -162,7 +162,7 @@ retry:
        if ((cp = strchr(ads->auth.user_name, '@'))!=0) {
                *cp++ = '\0';
                ads->auth.realm = smb_xstrdup(cp);
-               strupper(ads->auth.realm);
+               strupper_m(ads->auth.realm);
        }
 
        status = ads_connect(ads);
@@ -1039,7 +1039,7 @@ int net_ads_changetrustpw(int argc, const char **argv)
     }
 
     hostname = strdup(global_myname());
-    strlower(hostname);
+    strlower_m(hostname);
     asprintf(&host_principal, "%s@%s", hostname, ads->config.realm);
     SAFE_FREE(hostname);
     d_printf("Changing password for principal: HOST/%s\n", host_principal);

diff --git a/source/utils/net_rpc.c b/source/utils/net_rpc.c
index 552aacebbd0776af9a73c748b623432054c28b7f..890d4a012b131a07000dd97df05fe6d40ccab806 100644 (file)
--- a/source/utils/net_rpc.c
+++ b/source/utils/net_rpc.c
@@ -255,7 +255,7 @@ static NTSTATUS rpc_oldjoin_internals(const DOM_SID *domain_sid, struct cli_stat
        }
        
        fstrcpy(trust_passwd, global_myname());
-       strlower(trust_passwd);
+       strlower_m(trust_passwd);
 
        /*
         * Machine names can be 15 characters, but the max length on
@@ -1633,7 +1633,7 @@ static NTSTATUS rpc_trustdom_add_internals(const DOM_SID *domain_sid, struct cli
                return NT_STATUS_NO_MEMORY;
        }
 
-       strupper(acct_name);
+       strupper_m(acct_name);
 
        /* Get samr policy handle */
        result = cli_samr_connect(cli, mem_ctx, MAXIMUM_ALLOWED_ACCESS,
@@ -1764,11 +1764,11 @@ static int rpc_trustdom_establish(int argc, const char **argv)
        }
 
        domain_name = smb_xstrdup(argv[0]);
-       strupper(domain_name);
+       strupper_m(domain_name);
 
        /* account name used at first is our domain's name with '$' */
        asprintf(&acct_name, "%s$", lp_workgroup());
-       strupper(acct_name);
+       strupper_m(acct_name);
        
        /*
         * opt_workgroup will be used by connection functions further,
@@ -1933,7 +1933,7 @@ static int rpc_trustdom_revoke(int argc, const char **argv)
        
        /* generate upper cased domain name */
        domain_name = smb_xstrdup(argv[0]);
-       strupper(domain_name);
+       strupper_m(domain_name);
 
        /* delete password of the trust */
        if (!trusted_domain_password_delete(domain_name)) {
@@ -2167,7 +2167,7 @@ static int rpc_trustdom_list(int argc, const char **argv)
                        do padding[--pad_len] = ' '; while (pad_len);
 
                        /* set opt_* variables to remote domain */
-                       strupper(trusting_dom_names[i]);
+                       strupper_m(trusting_dom_names[i]);
                        opt_workgroup = talloc_strdup(mem_ctx, trusting_dom_names[i]);
                        opt_target_workgroup = opt_workgroup;
                        

diff --git a/source/utils/net_rpc_join.c b/source/utils/net_rpc_join.c
index e8fa39ec92d02cb7ffd728c08247cad56c7fe31d..22ed49c74f6b9bd796b229d761824acfe92db123 100644 (file)
--- a/source/utils/net_rpc_join.c
+++ b/source/utils/net_rpc_join.c
@@ -204,7 +204,7 @@ int net_rpc_join_newstyle(int argc, const char **argv)
 
        /* Create domain user */
        acct_name = talloc_asprintf(mem_ctx, "%s$", global_myname()); 
-       strlower(acct_name);
+       strlower_m(acct_name);
        const_acct_name = acct_name;
 
        result = cli_samr_create_dom_user(cli, mem_ctx, &domain_pol,
@@ -337,7 +337,7 @@ int net_rpc_join_newstyle(int argc, const char **argv)
 
        /* Now store the secret in the secrets database */
 
-       strupper(domain);
+       strupper_m(domain);
 
        if (!secrets_store_domain_sid(domain, &domain_sid)) {
                DEBUG(0, ("error storing domain sid for %s\n", domain));

diff --git a/source/utils/smbpasswd.c b/source/utils/smbpasswd.c
index 577e467fbdbe71717a2fb8455b86073c18f8d2cc..0b2714cbf8aac5640a72522478e14d1c20bb3b4a 100644 (file)
--- a/source/utils/smbpasswd.c
+++ b/source/utils/smbpasswd.c
@@ -392,7 +392,7 @@ static int process_root(int local_flags)
                if (local_flags & LOCAL_ADD_USER) {
                        SAFE_FREE(new_passwd);
                        new_passwd = smb_xstrdup(user_name);
-                       strlower(new_passwd);
+                       strlower_m(new_passwd);
                }
 
                /*