diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2011-06-08 16:27:06 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2011-06-09 12:40:09 +0200 |
| commit | f348d148b463ca61cbc48d2aadeaa099f7150425 (patch) | |
| tree | 0c9dd77dca2448a025df3293ccc7850281b8591d /source3/libsmb | |
| parent | 3ccc7609476139bc6a906110a2623605f3802159 (diff) | |
| download | samba-f348d148b463ca61cbc48d2aadeaa099f7150425.tar.gz samba-f348d148b463ca61cbc48d2aadeaa099f7150425.tar.bz2 samba-f348d148b463ca61cbc48d2aadeaa099f7150425.zip | |
s3-param Remove special case for global_scope()
There is no reason this can't be a normal constant string in the
loadparm system. (Past reasons were that we didn't have lp_set_cmdline())
Andrew Bartlett
Diffstat (limited to 'source3/libsmb')
| -rw-r--r-- | source3/libsmb/nmblib.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source3/libsmb/nmblib.c b/source3/libsmb/nmblib.c index f4d5ec7bbb..767ff81476 100644 --- a/source3/libsmb/nmblib.c +++ b/source3/libsmb/nmblib.c @@ -936,7 +936,7 @@ void make_nmb_name( struct nmb_name *n, const char *name, int type) strupper_m(unix_name); push_ascii(n->name, unix_name, sizeof(n->name), STR_TERMINATE); n->name_type = (unsigned int)type & 0xFF; - push_ascii(n->scope, global_scope(), 64, STR_TERMINATE); + push_ascii(n->scope, lp_netbios_scope(), 64, STR_TERMINATE); } /******************************************************************* @@ -1261,7 +1261,7 @@ char *name_mangle(TALLOC_CTX *mem_ctx, const char *In, char name_type) char *result; char *p; - result = talloc_array(mem_ctx, char, 33 + strlen(global_scope()) + 2); + result = talloc_array(mem_ctx, char, 33 + strlen(lp_netbios_scope()) + 2); if (result == NULL) { return NULL; } @@ -1296,8 +1296,8 @@ char *name_mangle(TALLOC_CTX *mem_ctx, const char *In, char name_type) p[0] = '\0'; /* Add the scope string. */ - for( i = 0, len = 0; *(global_scope()) != '\0'; i++, len++ ) { - switch( (global_scope())[i] ) { + for( i = 0, len = 0; *(lp_netbios_scope()) != '\0'; i++, len++ ) { + switch( (lp_netbios_scope())[i] ) { case '\0': p[0] = len; if( len > 0 ) @@ -1309,7 +1309,7 @@ char *name_mangle(TALLOC_CTX *mem_ctx, const char *In, char name_type) len = -1; break; default: - p[len+1] = (global_scope())[i]; + p[len+1] = (lp_netbios_scope())[i]; break; } } |