summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2002-12-06 19:58:27 +0000
committerJeremy Allison <jra@samba.org>2002-12-06 19:58:27 +0000
commit8c13b09b9d8dc8f4d7d3515f35dbd2fb58ff3e0e (patch)
treeeb7d790d045dba31ab28cc68560ff96263ede467
parent1815dad960e7e418dbeb7eb3d4d014322c7a093f (diff)
downloadsamba-8c13b09b9d8dc8f4d7d3515f35dbd2fb58ff3e0e.tar.gz
samba-8c13b09b9d8dc8f4d7d3515f35dbd2fb58ff3e0e.tar.bz2
samba-8c13b09b9d8dc8f4d7d3515f35dbd2fb58ff3e0e.zip
Ensure global_scope() returns "", not the NULL string. Froma tpot fix.
Jeremy. (This used to be commit 7185b846e41da2bf7edaa7f3edeff1cc1486d28b)
-rw-r--r--source3/lib/util.c6
-rw-r--r--source3/libsmb/nmblib.c2
2 files changed, 7 insertions, 1 deletions
diff --git a/source3/lib/util.c b/source3/lib/util.c
index 2e43281a88..a83e17c661 100644
--- a/source3/lib/util.c
+++ b/source3/lib/util.c
@@ -140,8 +140,14 @@ BOOL set_global_scope(const char *scope)
return True;
}
+/*********************************************************************
+ Ensure scope is never null string.
+*********************************************************************/
+
const char *global_scope(void)
{
+ if (!smb_scope)
+ set_global_scope("");
return smb_scope;
}
diff --git a/source3/libsmb/nmblib.c b/source3/libsmb/nmblib.c
index 43e32aebbd..d38e2ff0ec 100644
--- a/source3/libsmb/nmblib.c
+++ b/source3/libsmb/nmblib.c
@@ -1203,7 +1203,7 @@ int name_mangle( char *In, char *Out, char name_type )
p[0] = '\0';
/* Add the scope string. */
- for( i = 0, len = 0; NULL != global_scope(); i++, len++ )
+ for( i = 0, len = 0; *(global_scope()) != '\0'; i++, len++ )
{
switch( (global_scope())[i] )
{