[09/54] samba: Remove any options left to default value in global section

Message ID 20201013160812.27754-9-michael.tremer@ipfire.org
State Accepted
Commit 7a60353472926dca2d9921c6933c85b257f1e5a6
Headers show
Series [01/54] samba: Migrate configuration from Samba 3.6 to 4.x | expand

Commit Message

Michael Tremer Oct. 13, 2020, 4:07 p.m. UTC
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---
 config/samba/default.global | 17 +----------------
 html/cgi-bin/samba.cgi      |  8 +-------
 2 files changed, 2 insertions(+), 23 deletions(-)

Patch

diff --git a/config/samba/default.global b/config/samba/default.global
index 30587e47a..05d09a9a2 100644
--- a/config/samba/default.global
+++ b/config/samba/default.global
@@ -6,14 +6,9 @@  server string = Samba
 workgroup = homeip.net
 passdb backend = smbpasswd
 
-keep alive = 30
 os level = 33
-fstype = NTFS
 
-kernel oplocks = false
 map to guest = bad user
-smb ports = 445 139
-unix charset = CP850
 
 security = user
 guest account = samba
@@ -21,16 +16,6 @@  unix password sync = false
 
 bind interfaces only = true
 interfaces =  green0 127.0.0.1
-socket options = TCP_NODELAY SO_KEEPALIVE
 
-username level = 1
-wins support = true
-
-log file       = /var/log/samba/samba-log.%m
-lock directory = /var/lock/samba
-pid directory = /var/run/
+log file  = /var/log/samba/samba-log.%m
 log level = 3 passdb:5 auth:5 winbind:2
-
-preferred master = false
-domain master = false
-local master = false
diff --git a/html/cgi-bin/samba.cgi b/html/cgi-bin/samba.cgi
index fd43afd17..07665e8f1 100644
--- a/html/cgi-bin/samba.cgi
+++ b/html/cgi-bin/samba.cgi
@@ -283,13 +283,9 @@  if ($sambasettings{'SMB2'} eq 'on'){
 }
 
 print FILE <<END
-keep alive = 30
 os level = $sambasettings{'OSLEVEL'}
-fstype = NTFS
 
-kernel oplocks = false
 map to guest = $sambasettings{'MAPTOGUEST'}
-smb ports = 445 139
 dos charset = $sambasettings{'DOSCHARSET'}
 unix charset = $sambasettings{'UNIXCHARSET'}
 
@@ -302,7 +298,6 @@  interfaces = $sambasettings{'INTERFACES'}
 remote announce = $sambasettings{'REMOTEANNOUNCE'}
 remote browse sync = $sambasettings{'REMOTESYNC'}
 
-username level = 1
 wins support = $sambasettings{'WINSSUPPORT'}
 wins server = $sambasettings{'WINSSRV'}
 
@@ -311,8 +306,7 @@  winbind uid = 10000-20000
 winbind gid = 10000-20000
 winbind use default domain = yes
 
-log file       = /var/log/samba/samba-log.%m
-pid directory  = /var/run/
+log file  = /var/log/samba/samba-log.%m
 log level = $sambasettings{'LOGLEVEL'}
 
 preferred master = $sambasettings{'PREFERREDMASTER'}