- 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
(This used to be commit e9eac6cd49c352349580ddb13d720cb201aecc48)

1 files changed, 5 insertions, 13 deletions

diff --git a/source3/nmbd/nmbd.c b/source3/nmbd/nmbd.c
index 82ea9550f3..2621be87ee 100644
--- a/source3/nmbd/nmbd.c
+++ b/source3/nmbd/nmbd.c
@@ -305,14 +305,6 @@ static void process(void)
 
       announce_host();
 
-#if 0
-      /* XXXX what was this stuff supposed to do? It sent
-	 ANN_GetBackupListReq packets which I think should only be
-	 sent when trying to find out who to browse with */	 
-
-      announce_backup();
-#endif
-
       announce_master();
 
       announce_remote();
@@ -344,11 +336,11 @@ static BOOL open_sockets(BOOL isdaemon, int port)
   }   
 
   if (isdaemon)
-    ClientNMB = open_socket_in(SOCK_DGRAM, port,0);
+    ClientNMB = open_socket_in(SOCK_DGRAM, port,0,interpret_addr(lp_socket_address()));
   else
     ClientNMB = 0;
   
-  ClientDGRAM = open_socket_in(SOCK_DGRAM,DGRAM_PORT,3);
+  ClientDGRAM = open_socket_in(SOCK_DGRAM,DGRAM_PORT,3,interpret_addr(lp_socket_address()));
 
   if (ClientNMB == -1)
     return(False);
@@ -376,8 +368,8 @@ static BOOL init_structs()
     strcpy(myname,myhostname);
     p = strchr(myname,'.');
     if (p) *p = 0;
-    strupper(myname);
   }
+  strupper(myname);
 
   return True;
 }
@@ -490,11 +482,11 @@ static void usage(char *pname)
   DEBUG(1,("%s netbios nameserver version %s started\n",timestring(),VERSION));
   DEBUG(1,("Copyright Andrew Tridgell 1994\n"));
 
-  init_structs();
-
   if (!reload_services(False))
     return(-1);	
 
+  init_structs();
+
   set_samba_nb_type();
 
   if (!is_daemon && !is_a_socket(0)) {