- add timeouts to connect() for password server connections. This

[kai/samba.git] / source3 / nmbd / nmbd.c

diff --git a/source3/nmbd/nmbd.c b/source3/nmbd/nmbd.c
index 097e4f794a53d3552d57a448461e63844f185867..5b3fd19491de9a013fb639778ccdc2d2d1cdf6e8 100644 (file)
--- a/source3/nmbd/nmbd.c
+++ b/source3/nmbd/nmbd.c
@@ -357,17 +357,22 @@ static BOOL open_sockets(BOOL isdaemon, int port)
 ****************************************************************************/
 static BOOL init_structs()
 {
-  if (!get_myname(myhostname,NULL))
-    return(False);
+  extern fstring local_machine;
+  char *p;
 
   if (! *myname) {
-    char *p;
     strcpy(myname,myhostname);
     p = strchr(myname,'.');
     if (p) *p = 0;
   }
   strupper(myname);
 
+  strcpy(local_machine,myname);
+  trim_string(local_machine," "," ");
+  p = strchr(local_machine,' ');
+  if (p) *p = 0;
+  strlower(local_machine);
+
   return True;
 }
 
@@ -479,11 +484,15 @@ static void usage(char *pname)
   DEBUG(1,("%s netbios nameserver version %s started\n",timestring(),VERSION));
   DEBUG(1,("Copyright Andrew Tridgell 1994\n"));
 
+  get_myname(myhostname,NULL);
+
   if (!reload_services(False))
     return(-1);        
 
   init_structs();
 
+  reload_services(True);
+
   set_samba_nb_type();
 
   if (!is_daemon && !is_a_socket(0)) {