- added "netbios name" option in smb.conf to make controlling the name

that samba uses possible

- added "socket address" option to allow virtual SMB servers (on
systems with IP aliasing line Linux)

- disabled FAST_SHARE_MODES by default in Linux as older Linux boxes
can't do shared writeable mappings. We really need autoconf ...

- added new option types in loadparm so a string type can be specified
ot be uppercase only, this is used for the workgroup and netbios name
options

- auto-create the lock directory if it doesn't exist in shared mem
startup

- get rid of announce_backup()

- change a few comments in nmbd code

- rewrote the chaining code completely. Hopefully it will handle any
depth chains now.

- added LPRng support

2 files changed, 9 insertions, 11 deletions

diff --git a/source/client/client.c b/source/client/client.c
index b0e4f4a0044..6bd94be7569 100644
--- a/source/client/client.c
+++ b/source/client/client.c
@@ -33,7 +33,7 @@ pstring cur_dir = "\\";
 pstring cd_path = "";
 pstring service="";
 pstring desthost="";
-pstring myname = "";
+extern pstring myname;
 pstring password = "";
 pstring username="";
 pstring workgroup=WORKGROUP;
@@ -3988,11 +3988,10 @@ static BOOL open_sockets(int port )
       strcpy(desthost,host);
     }
 
-  if (*myname == 0)
-    {
+  if (*myname == 0) {
       get_myname(myname,NULL);
-      strupper(myname);
-    }
+  }
+  strupper(myname);
 
   DEBUG(3,("Opening sockets\n"));
 
@@ -4008,7 +4007,8 @@ static BOOL open_sockets(int port )
 	/* Try and resolve the name with the netbios server */
 	int           	bcast;
 
-	if ((bcast = open_socket_in(SOCK_DGRAM, 0, 3)) != -1) {
+	if ((bcast = open_socket_in(SOCK_DGRAM, 0, 3,
+				    interpret_addr(lp_socket_address()))) != -1) {
 	  set_socket_options(bcast, "SO_BROADCAST");
 
 	  if (name_query(bcast, host, 0x20, True, True, *iface_bcast(dest_ip),
diff --git a/source/client/clientutil.c b/source/client/clientutil.c
index 41c482196ad..e684d426121 100644
--- a/source/client/clientutil.c
+++ b/source/client/clientutil.c
@@ -31,7 +31,7 @@
 
 pstring service="";
 pstring desthost="";
-pstring myname = "";
+extern pstring myname;
 pstring password = "";
 pstring username="";
 pstring workgroup=WORKGROUP;
@@ -819,10 +819,8 @@ BOOL cli_open_sockets(int port)
   DEBUG(5,("Opening sockets\n"));
 
   if (*myname == 0)
-    {
-      get_myname(myname,NULL);
-      strupper(myname);
-    }
+    get_myname(myname,NULL);
+  strupper(myname);
 
   if (!have_ip)
     {