diff options
author | Jeremy Allison <jra@samba.org> | 2003-07-03 19:11:31 +0000 |
---|---|---|
committer | Jeremy Allison <jra@samba.org> | 2003-07-03 19:11:31 +0000 |
commit | ce72beb2b558d86fb49063c6b1fa00e07952ce56 (patch) | |
tree | 9c00a82c30d6edb2d9ce269653e739236ede67ce /source3/smbd | |
parent | 6b31240391949fb6afa83853aa3df30b354d508a (diff) | |
download | samba-ce72beb2b558d86fb49063c6b1fa00e07952ce56.tar.gz samba-ce72beb2b558d86fb49063c6b1fa00e07952ce56.tar.bz2 samba-ce72beb2b558d86fb49063c6b1fa00e07952ce56.zip |
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.
(This used to be commit ff222716a08af65d26ad842ce4c2841cc6540959)
Diffstat (limited to 'source3/smbd')
-rw-r--r-- | source3/smbd/lanman.c | 8 | ||||
-rw-r--r-- | source3/smbd/mangle_hash.c | 5 | ||||
-rw-r--r-- | source3/smbd/negprot.c | 2 | ||||
-rw-r--r-- | source3/smbd/open.c | 2 | ||||
-rw-r--r-- | source3/smbd/service.c | 4 | ||||
-rw-r--r-- | source3/smbd/statcache.c | 4 |
6 files changed, 13 insertions, 12 deletions
diff --git a/source3/smbd/lanman.c b/source3/smbd/lanman.c index 6976a06684..04d6a9a8a8 100644 --- a/source3/smbd/lanman.c +++ b/source3/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/source3/smbd/mangle_hash.c b/source3/smbd/mangle_hash.c index d4cf369f28..ac8e425fd3 100644 --- a/source3/smbd/mangle_hash.c +++ b/source3/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/source3/smbd/negprot.c b/source3/smbd/negprot.c index 2a2ca25532..f452dd845b 100644 --- a/source3/smbd/negprot.c +++ b/source3/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/source3/smbd/open.c b/source3/smbd/open.c index 15171ce9e3..85d115a3bf 100644 --- a/source3/smbd/open.c +++ b/source3/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/source3/smbd/service.c b/source3/smbd/service.c index 11659f2870..6a23e38bbd 100644 --- a/source3/smbd/service.c +++ b/source3/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/source3/smbd/statcache.c b/source3/smbd/statcache.c index 593df745cc..5d54a5c4ff 100644 --- a/source3/smbd/statcache.c +++ b/source3/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 |