From: Rosen Penev <rosenp@gmail.com>
Date: Fri, 21 Jul 2017 20:04:34 +0000 (-0700)
Subject: samba36: Remove legacy options
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=a37f8b0c6e92012277ba0f7c04ea6d2737544814;p=openwrt%2Fstaging%2Fxback.git

samba36: Remove legacy options

Browseable is now set through LuCI per share, so remove it. Same with
writeable (inverted synonym for read only). domain master and preferred
master seem to be legacy settings for Windows 9x. encrypt passwords
defaults to yes. Probably should not be disabled either.

Also reordered alphabetically.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
[rewrap commit message, fix SoB, fix author, bump pkg revsion]
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 9dcb3fe7eb06b42c4f026e6cc5e89b2a18932782)
---

diff --git a/package/network/services/samba36/files/smb.conf.template b/package/network/services/samba36/files/smb.conf.template
index 35e486fd89..c35d7792bd 100644
--- a/package/network/services/samba36/files/smb.conf.template
+++ b/package/network/services/samba36/files/smb.conf.template
@@ -5,24 +5,19 @@
 	server string = |DESCRIPTION|
 	unix charset = |CHARSET|
 	workgroup = |WORKGROUP|
-	local master = no
-	browseable = yes
+	bind interfaces only = yes
 	deadtime = 30
-	domain master = yes
-	encrypt passwords = yes
 	enable core files = no
 	guest ok = yes
 	invalid users = root
 	load printers = no
+	local master = yes
 	map to guest = Bad User
 	max protocol = SMB2
 	min receivefile size = 16384
 	null passwords = yes
 	passdb backend = smbpasswd
-	preferred master = yes
 	security = user
 	smb passwd file = /etc/samba/smbpasswd
 	syslog = 2
 	use sendfile = yes
-	writeable = yes
-	bind interfaces only = yes