smbd/mangle.c

smbd/negprot.c: Tidyup of static initializers.
smbd/server.c: Fix -l option.
Jeremy.

diff --git a/source/Makefile.in b/source/Makefile.in
index 6201e63c88695d997141e9948f11a4b554acc216..931435e823e9e3be26731d483afdec3f13651ffd 100644 (file)
--- a/source/Makefile.in
+++ b/source/Makefile.in
@@ -57,7 +57,7 @@ LOCKDIR = @lockdir@
 CODEPAGEDIR = $(LIBDIR)/codepages
 
 # The current codepage definition list.
-CODEPAGELIST= 437 737 850 852 861 932 866 949 950 936 ISO8859-1 ISO8859-2 ISO8859-5 ISO8859-7 KOI-R
+CODEPAGELIST= 437 737 850 852 861 932 866 949 950 936 1251 ISO8859-1 ISO8859-2 ISO8859-5 ISO8859-7 KOI-R
 
 # where you are going to have the smbrun binary. This defaults to the 
 # install directory. This binary is needed for correct printing

diff --git a/source/include/includes.h b/source/include/includes.h
index e2139345c096d540629da5bf195e22d728191037..4177189d6e941d93bffd4b2acd2f359c1c030e10 100644 (file)
--- a/source/include/includes.h
+++ b/source/include/includes.h
@@ -198,7 +198,6 @@
 #endif
 
 #include <pwd.h>
-#include <grp.h>
 
 #ifdef HAVE_STDARG_H
 #include <stdarg.h>

diff --git a/source/smbd/mangle.c b/source/smbd/mangle.c
index 48e16e533222b12e8f6bb5d8a7daa8a38e40f09c..4c306ad00f85ce51728c34f9892825aa27aa5e39 100644 (file)
--- a/source/smbd/mangle.c
+++ b/source/smbd/mangle.c
@@ -124,7 +124,7 @@ static BOOL          ct_initialized = False;
 #define isbasechar(C) ( (chartest[ ((C) & 0xff) ]) & BASECHAR_MASK )
 #define isillegal(C) ( (chartest[ ((C) & 0xff) ]) & ILLEGAL_MASK )
 
-static ubi_cacheRoot mangled_cache[1] = { { { 0 }, 0, 0, 0, 0, 0, 0} };
+static ubi_cacheRoot mangled_cache[1] =  { { { 0, 0, 0, 0 }, 0, 0, 0, 0, 0, 0 } };
 static BOOL          mc_initialized   = False;
 #define MANGLED_CACHE_MAX_ENTRIES 0
 #define MANGLED_CACHE_MAX_MEMORY  16384

diff --git a/source/smbd/negprot.c b/source/smbd/negprot.c
index b2366b0a3794b14ad6c61865325f4b5c0b8f1b5a..3cabc6b22956cc79042bb2122816efa89311ac98 100644 (file)
--- a/source/smbd/negprot.c
+++ b/source/smbd/negprot.c
@@ -315,7 +315,7 @@ static struct {
   {"MICROSOFT NETWORKS 3.0",  "LANMAN1",  reply_lanman1,  PROTOCOL_LANMAN1},
   {"MICROSOFT NETWORKS 1.03", "COREPLUS", reply_coreplus, PROTOCOL_COREPLUS},
   {"PC NETWORK PROGRAM 1.0",  "CORE",     reply_corep,    PROTOCOL_CORE}, 
-  {NULL,NULL},
+  {NULL,NULL,NULL,0},
 };
 
 

diff --git a/source/smbd/server.c b/source/smbd/server.c
index 79d37e5093317a4ca75cc82227ccf59273f99ab0..bd07ed8458e8e463c188eb1de7a2b8e4eb1cf169 100644 (file)
--- a/source/smbd/server.c
+++ b/source/smbd/server.c
@@ -504,6 +504,7 @@ static void usage(char *pname)
        extern BOOL append_log;
        /* shall I run as a daemon */
        BOOL is_daemon = False;
+       BOOL specified_logfile = False;
        int port = SMB_PORT;
        int opt;
        extern char *optarg;
@@ -536,6 +537,7 @@ static void usage(char *pname)
                        break;
 
                case 'l':
+                       specified_logfile = True;
                        pstrcpy(debugf,optarg);
                        break;
 
@@ -597,7 +599,8 @@ static void usage(char *pname)
 
        TimeInit();
 
-       pstrcpy(debugf,SMBLOGFILE);  
+       if(!specified_logfile)
+               pstrcpy(debugf,SMBLOGFILE);  
 
        pstrcpy(remote_machine, "smb");
 
@@ -714,10 +717,16 @@ static void usage(char *pname)
                pidfile_create("smbd");
        }
 
-       if (!locking_init(0))
+       if (!open_sockets(is_daemon,port))
                exit(1);
 
-       if (!open_sockets(is_daemon,port))
+       /*
+        * Note that this call should be done after the fork() call
+        * in open_sockets(), as some versions of the locking shared
+        * memory code register openers in a flat file.
+        */ 
+
+       if (!locking_init(0))
                exit(1);
 
        if(!initialize_password_db())