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)

1 files changed, 2 insertions, 9 deletions

diff --git a/source3/nmbd/nmbd.c b/source3/nmbd/nmbd.c
index 5bb3d7fc00d..cf472d579d7 100644
--- a/source3/nmbd/nmbd.c
+++ b/source3/nmbd/nmbd.c
@@ -32,8 +32,6 @@ extern int DEBUGLEVEL;
 extern pstring debugf;
 pstring servicesf = CONFIGFILE;
 
-extern pstring scope;
-
 int ClientNMB       = -1;
 int ClientDGRAM     = -1;
 int global_nmb_port = -1;
@@ -606,7 +604,7 @@ static void usage(char *pname)
 {
 
   printf( "Usage: %s [-DaohV] [-H lmhosts file] [-d debuglevel] [-l log basename]\n", pname );
-  printf( "       [-n name] [-p port] [-s configuration file] [-i scope]\n" );
+  printf( "       [-n name] [-p port] [-s configuration file]\n" );
   printf( "\t-D                    Become a daemon\n" );
   printf( "\t-a                    Append to log file (default)\n" );
   printf( "\t-o                    Overwrite log file, don't append\n" );
@@ -618,7 +616,6 @@ static void usage(char *pname)
   printf( "\t-n netbiosname.       Primary netbios name\n" );
   printf( "\t-p port               Listen on the specified port\n" );
   printf( "\t-s configuration file Configuration file name\n" );
-  printf( "\t-i scope              NetBIOS scope\n" );
   printf( "\n");
 } /* usage */
 
@@ -686,7 +683,7 @@ static void usage(char *pname)
 #endif /* SIGUSR2 */
 
   while( EOF != 
-         (opt = getopt( argc, argv, "Vaos:T:I:C:bAi:B:N:Rn:l:d:Dp:hSH:G:f:" )) )
+         (opt = getopt( argc, argv, "Vaos:T:I:C:bAB:N:Rn:l:d:Dp:hSH:G:f:" )) )
     {
       switch (opt)
         {
@@ -710,10 +707,6 @@ static void usage(char *pname)
         case 'l':
           slprintf(debugf,sizeof(debugf)-1, "%s.nmb",optarg);
           break;
-        case 'i':
-          pstrcpy(scope,optarg);
-          strupper(scope);
-          break;
         case 'a':
           append_log = True;
           break;