diff options
| author | Jeremy Allison <jra@samba.org> | 2002-12-06 19:59:04 +0000 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2002-12-06 19:59:04 +0000 |
| commit | ccdfed5587d4da1f2a4154ed151626d79765cc8f (patch) | |
| tree | 2653c9105236c0838640252cec7e3f7cfefce5ee | |
| parent | 2c5e33b7f2e372b348c4aa97824078f7b62db8ff (diff) | |
| download | samba-ccdfed5587d4da1f2a4154ed151626d79765cc8f.tar.gz samba-ccdfed5587d4da1f2a4154ed151626d79765cc8f.tar.bz2 samba-ccdfed5587d4da1f2a4154ed151626d79765cc8f.zip | |
Ensure global_scope() returns "", not the NULL string. Froma tpot fix.
Jeremy.
(This used to be commit 0ff254264e6e43399404595bc87b5bd889e17952)
| -rw-r--r-- | source3/lib/util.c | 6 | ||||
| -rw-r--r-- | source3/libsmb/nmblib.c | 2 |
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] ) { |