summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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] )
{