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>

diff --git a/package/network/services/samba36/Makefile b/package/network/services/samba36/Makefile
index 8c2f6b08545e7ffc4c15ce3bc7a38914cd914fdd..24d3f030012c4434749ee86e297769b2ac498543 100644 (file)
--- a/package/network/services/samba36/Makefile
+++ b/package/network/services/samba36/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=samba
 PKG_VERSION:=3.6.25
-PKG_RELEASE:=6
+PKG_RELEASE:=7
 
 PKG_SOURCE_URL:=https://download.samba.org/pub/samba \
                https://download.samba.org/pub/samba/stable

diff --git a/package/network/services/samba36/files/smb.conf.template b/package/network/services/samba36/files/smb.conf.template
index 35e486fd8922f3af31d0d534f0a21fc9a1b290d2..c35d7792bd05e7305c03caa2eb0087354843e414 100644 (file)
--- 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