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)

5 files changed, 8 insertions, 8 deletions

diff --git a/source3/libsmb/clirap.c b/source3/libsmb/clirap.c
index 9d4411797d..a307ac6ccf 100644
--- a/source3/libsmb/clirap.c
+++ b/source3/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/source3/libsmb/clirap2.c b/source3/libsmb/clirap2.c
index 948e88061a..669b33860d 100644
--- a/source3/libsmb/clirap2.c
+++ b/source3/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/source3/libsmb/namequery_dc.c b/source3/libsmb/namequery_dc.c
index 8bfb00b9ad..c9d45a7acc 100644
--- a/source3/libsmb/namequery_dc.c
+++ b/source3/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/source3/libsmb/nmblib.c b/source3/libsmb/nmblib.c
index b96111240f..157a2bb43c 100644
--- a/source3/libsmb/nmblib.c
+++ b/source3/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/source3/libsmb/ntlmssp.c b/source3/libsmb/ntlmssp.c
index 636e384e65..609b394560 100644
--- a/source3/libsmb/ntlmssp.c
+++ b/source3/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) 
 	{