Remove some globals

(This used to be commit 31d0a846db08d845e6cdfd85def4ac1c34031e02)

4 files changed, 6 insertions, 7 deletions

diff --git a/source3/libsmb/dsgetdcname.c b/source3/libsmb/dsgetdcname.c
index b0870e249e..f8089cbd6a 100644
--- a/source3/libsmb/dsgetdcname.c
+++ b/source3/libsmb/dsgetdcname.c
@@ -265,8 +265,7 @@ static char *DsGetDcName_cache_key(TALLOC_CTX *mem_ctx, const char *domain)
 		return NULL;
 	}
 
-	return talloc_asprintf(mem_ctx, DSGETDCNAME_FMT,
-			       strupper_static(domain));
+	return talloc_asprintf_strupper_m(mem_ctx, DSGETDCNAME_FMT, domain);
 }
 
 /****************************************************************
diff --git a/source3/libsmb/namecache.c b/source3/libsmb/namecache.c
index 6a675d2ef2..ba706e5ee2 100644
--- a/source3/libsmb/namecache.c
+++ b/source3/libsmb/namecache.c
@@ -98,7 +98,7 @@ static char* namecache_key(const char *name,
 				int name_type)
 {
 	char *keystr;
-	asprintf(&keystr, NBTKEY_FMT, strupper_static(name), name_type);
+	asprintf_strupper_m(&keystr, NBTKEY_FMT, name, name_type);
 
 	return keystr;
 }
@@ -318,8 +318,8 @@ static char *namecache_status_record_key(const char *name,
 	char *keystr;
 
 	print_sockaddr(addr, sizeof(addr), keyip);
-	asprintf(&keystr, "NBT/%s#%02X.%02X.%s",
-			strupper_static(name), name_type1, name_type2, addr);
+	asprintf_strupper_m(&keystr, "NBT/%s#%02X.%02X.%s", name,
+			    name_type1, name_type2, addr);
 	return keystr;
 }
 
diff --git a/source3/libsmb/namequery.c b/source3/libsmb/namequery.c
index 71d7096914..04db3322ca 100644
--- a/source3/libsmb/namequery.c
+++ b/source3/libsmb/namequery.c
@@ -39,7 +39,7 @@ static char *saf_key(const char *domain)
 {
 	char *keystr;
 
-	asprintf( &keystr, SAFKEY_FMT, strupper_static(domain) );
+	asprintf_strupper_m(&keystr, SAFKEY_FMT, domain);
 
 	return keystr;
 }
diff --git a/source3/libsmb/trustdom_cache.c b/source3/libsmb/trustdom_cache.c
index f350cd0bc8..be73381aa3 100644
--- a/source3/libsmb/trustdom_cache.c
+++ b/source3/libsmb/trustdom_cache.c
@@ -90,7 +90,7 @@ bool trustdom_cache_shutdown(void)
 static char* trustdom_cache_key(const char* name)
 {
 	char* keystr = NULL;
-	asprintf(&keystr, TDOMKEY_FMT, strupper_static(name));
+	asprintf_strupper_m(&keystr, TDOMKEY_FMT, name);
 	
 	return keystr;
 }