samba: Make sure that permissions of the lock dir are fine.

diff --git a/html/cgi-bin/samba.cgi b/html/cgi-bin/samba.cgi
index b9bf9f3f3933974dd7310e34ec9090b00753fb20..0e1409c73bf3294ae76e37e42042ced9b90318bc 100644 (file)
--- a/html/cgi-bin/samba.cgi
+++ b/html/cgi-bin/samba.cgi
@@ -325,7 +325,6 @@ winbind gid = 10000-20000
 winbind use default domain = yes
 
 log file       = /var/log/samba/samba-log.%m
-lock directory = /var/lock/samba
 pid directory  = /var/run/
 log level = $sambasettings{'LOGLEVEL'}
 syslog = $sambasettings{'SYSLOGLEVEL'}

diff --git a/lfs/samba b/lfs/samba
index 2dda62ccfa308762e274d0eeb1d26a7babb03497..5de1526b99a2b38a7011a85417792ee28ae953d1 100644 (file)
--- a/lfs/samba
+++ b/lfs/samba
@@ -82,6 +82,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
                --libdir=/usr/lib/ \
                --sysconfdir=/var/ipfire \
                --localstatedir=/var \
+               --with-cachedir=/var/lib/samba \
                --with-lockdir=/var/lib/samba \
                --with-piddir=/var/run \
                --with-ads \
@@ -96,6 +97,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
                --with-winbind \
                --disable-swat \
                --enable-cups \
+               --disable-avahi \
                --with-syslog
        cd $(DIR_APP)/source3 && make proto && make all $(MAKETUNING) $(EXTRA_MAKE)
        cd $(DIR_APP)/source3 && make install

diff --git a/src/initscripts/init.d/samba b/src/initscripts/init.d/samba
index 1c062bf7ebc1a50a972c0b647a2fa59b8e8c0694..614c9b8343059c572dc38bd0536816eff6c55b1d 100644 (file)
--- a/src/initscripts/init.d/samba
+++ b/src/initscripts/init.d/samba
@@ -7,8 +7,17 @@
 . /etc/sysconfig/rc
 . $rc_functions
 
+function fix_permissions() {
+       local lockdir="/var/lib/samba/winbindd_privileged"
+
+       chmod 750 "${lockdir}"
+       chgrp wbpriv "${lockdir}"
+}
+
 case "$1" in
        start)
+               fix_permissions
+
                boot_mesg "Starting nmbd..."
                loadproc /usr/sbin/nmbd -D