Merge branch 'master' into next

[ipfire-2.x.git] / html / cgi-bin / samba.cgi

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'}