make the initial logfile names consistent. This should mean that smbd

starts with log.smb and nmbd starts with log.nmb. It also gets rid of
the "log." when using the log.%m construct as %m expands to smb before
a client connects.
(This used to be commit b7712a0a6d0afeef6239d5af61cba677eebb247b)

diff --git a/source3/nmbd/nmbd.c b/source3/nmbd/nmbd.c
index b6e4244cd01815a58259bda196fc4c99baba4ba4..d42580bcbd7fca9ce61cc5d112098a191ac671db 100644 (file)
--- a/source3/nmbd/nmbd.c
+++ b/source3/nmbd/nmbd.c
@@ -204,7 +204,7 @@ BOOL reload_services(BOOL test)
   BOOL ret;
   extern fstring remote_machine;
 
-  strcpy( remote_machine, "nmbd" );
+  strcpy( remote_machine, "nmb" );
 
   if ( lp_loaded() )
   {

diff --git a/source3/smbd/server.c b/source3/smbd/server.c
index 0a6a05fdbfebf7b4ad16d57f47e7928a1d7a6d6a..c2880b0e890cc0c11c4bbe23fe32cde0de7b07ec 100644 (file)
--- a/source3/smbd/server.c
+++ b/source3/smbd/server.c
@@ -5239,6 +5239,8 @@ static void usage(char *pname)
 
   strcpy(debugf,SMBLOGFILE);  
 
+  strcpy(remote_machine, "smb");
+
   setup_logging(argv[0],False);
 
   charset_initialise();