summaryrefslogtreecommitdiff
path: root/source3/lib
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2000-01-07 06:55:36 +0000
committerAndrew Tridgell <tridge@samba.org>2000-01-07 06:55:36 +0000
commit171da4d78736730557a94b44af9f2d62081b80ba (patch)
treead74341f9d50a521baec09c65637b81b150a0891 /source3/lib
parent102e44e446035bdcc7611b8b556d0e20978fbb80 (diff)
downloadsamba-171da4d78736730557a94b44af9f2d62081b80ba.tar.gz
samba-171da4d78736730557a94b44af9f2d62081b80ba.tar.bz2
samba-171da4d78736730557a94b44af9f2d62081b80ba.zip
this looks like a big commit, but it isn't really :)
This fixes our netbios scope handling. We now have a 'netbios scope' option in smb.conf and the scope option is removed from make_nmb_name() this was prompted by a bug in our PDC finding code where it didn't append the scope to the query of the '*' name. (This used to be commit b563be824b8c3141c49558eced7829b48d4ab26f)
Diffstat (limited to 'source3/lib')
-rw-r--r--source3/lib/msrpc_use.c1
-rw-r--r--source3/lib/util.c9
2 files changed, 4 insertions, 6 deletions
diff --git a/source3/lib/msrpc_use.c b/source3/lib/msrpc_use.c
index c755a35fb4..13bf7eb5f7 100644
--- a/source3/lib/msrpc_use.c
+++ b/source3/lib/msrpc_use.c
@@ -26,7 +26,6 @@
#include "trans2.h"
extern int DEBUGLEVEL;
-extern pstring scope;
extern pstring global_myname;
struct msrpc_use
diff --git a/source3/lib/util.c b/source3/lib/util.c
index a7c322c0a0..5063dab9c4 100644
--- a/source3/lib/util.c
+++ b/source3/lib/util.c
@@ -58,8 +58,6 @@ extern SSL *ssl;
extern int sslFd;
#endif /* WITH_SSL */
-pstring scope = "";
-
extern int DEBUGLEVEL;
int Protocol = PROTOCOL_COREPLUS;
@@ -297,6 +295,7 @@ int name_mangle( char *In, char *Out, char name_type )
int len;
char buf[20];
char *p = Out;
+ extern pstring global_scope;
/* Safely copy the input string, In, into buf[]. */
(void)memset( buf, 0, 20 );
@@ -320,9 +319,9 @@ int name_mangle( char *In, char *Out, char name_type )
p[0] = '\0';
/* Add the scope string. */
- for( i = 0, len = 0; NULL != scope; i++, len++ )
+ for( i = 0, len = 0; NULL != global_scope; i++, len++ )
{
- switch( scope[i] )
+ switch( global_scope[i] )
{
case '\0':
p[0] = len;
@@ -335,7 +334,7 @@ int name_mangle( char *In, char *Out, char name_type )
len = -1;
break;
default:
- p[len+1] = scope[i];
+ p[len+1] = global_scope[i];
break;
}
}