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)

3 files changed, 17 insertions, 14 deletions

diff --git a/source3/client/client.c b/source3/client/client.c
index 8915d197ab..3dc8371bb0 100644
--- a/source3/client/client.c
+++ b/source3/client/client.c
@@ -42,7 +42,6 @@ static char *cmdstr;
 static BOOL got_pass;
 static int io_bufsize = 65520;
 extern struct in_addr ipzero;
-extern pstring scope;
 
 static int name_type = 0x20;
 
@@ -1890,8 +1889,8 @@ struct cli_state *do_connect(char *server, char *share)
 	
 	ip = ipzero;
 
-	make_nmb_name(&calling, global_myname, 0x0, "");
-	make_nmb_name(&called , server, name_type, "");
+	make_nmb_name(&calling, global_myname, 0x0);
+	make_nmb_name(&called , server, name_type);
 
  again:
 	ip = ipzero;
@@ -1914,7 +1913,7 @@ struct cli_state *do_connect(char *server, char *share)
 			goto again;
 		}
 		if (strcmp(called.name, "*SMBSERVER")) {
-			make_nmb_name(&called , "*SMBSERVER", 0x20, "");
+			make_nmb_name(&called , "*SMBSERVER", 0x20);
 			goto again;
 		}
 		return NULL;
@@ -2141,8 +2140,8 @@ static int do_message_op(void)
 
 	ip = ipzero;
 
-	make_nmb_name(&calling, global_myname, 0x0, "");
-	make_nmb_name(&called , desthost, name_type, "");
+	make_nmb_name(&calling, global_myname, 0x0);
+	make_nmb_name(&called , desthost, name_type);
 
 	ip = ipzero;
 	if (have_ip) ip = dest_ip;
@@ -2329,7 +2328,11 @@ static int do_message_op(void)
 			message = True;
 			break;
 		case 'i':
-			pstrcpy(scope,optarg);
+			{
+				extern pstring global_scope;
+				pstrcpy(global_scope,optarg);
+				strupper(global_scope);
+			}
 			break;
 		case 'N':
 			got_pass = True;
diff --git a/source3/client/smbmount.c b/source3/client/smbmount.c
index e25efcaf56..18af824c1f 100644
--- a/source3/client/smbmount.c
+++ b/source3/client/smbmount.c
@@ -37,7 +37,6 @@
 extern struct in_addr ipzero;
 extern int DEBUGLEVEL;
 
-extern pstring scope;
 extern BOOL in_client;
 extern pstring user_socket_options;
 
@@ -142,8 +141,8 @@ static struct cli_state *do_connection(char *service)
 	
 	ip = ipzero;
 
-	make_nmb_name(&calling, my_netbios_name, 0x0, "");
-	make_nmb_name(&called , server, 0x20, "");
+	make_nmb_name(&calling, my_netbios_name, 0x0);
+	make_nmb_name(&called , server, 0x20);
 
  again:
 	ip = ipzero;
@@ -160,7 +159,7 @@ static struct cli_state *do_connection(char *service)
 		fprintf(stderr, "session request to %s failed\n", called.name);
 		cli_shutdown(c);
 		if (strcmp(called.name, "*SMBSERVER")) {
-			make_nmb_name(&called , "*SMBSERVER", 0x20, "");
+			make_nmb_name(&called , "*SMBSERVER", 0x20);
 			goto again;
 		}
 		return NULL;
@@ -517,6 +516,7 @@ static void parse_mount_smb(int argc, char **argv)
 	char *opteq;
 	extern char *optarg;
 	int val;
+	extern pstring global_scope;
 
 	if (argc < 2 || argv[1][0] == '-') {
 		usage();
@@ -591,7 +591,7 @@ static void parse_mount_smb(int argc, char **argv)
 			} else if(!strcmp(opts, "sockopt")) {
 				pstrcpy(user_socket_options,opteq+1);
 			} else if(!strcmp(opts, "scope")) {
-				pstrcpy(scope,opteq+1);
+				pstrcpy(global_scope,opteq+1);
 			} else {
 				usage();
 				exit(1);
diff --git a/source3/client/smbspool.c b/source3/client/smbspool.c
index 3dfa90f7a4..dd1d17d71a 100644
--- a/source3/client/smbspool.c
+++ b/source3/client/smbspool.c
@@ -242,8 +242,8 @@ smb_connect(char *workgroup,		/* I - Workgroup */
 
   ip = ipzero;
 
-  make_nmb_name(&calling, myname, 0x0, "");
-  make_nmb_name(&called, server, 0x20, "");
+  make_nmb_name(&calling, myname, 0x0);
+  make_nmb_name(&called, server, 0x20);
 
  /*
   * Open a new connection to the SMB server...