aboutsummaryrefslogtreecommitdiffstats
path: root/package/network
diff options
context:
space:
mode:
authorRosen Penev <rosenp@gmail.com>2017-07-21 13:04:34 -0700
committerJo-Philipp Wich <jo@mein.io>2017-07-22 16:55:01 +0200
commit9dcb3fe7eb06b42c4f026e6cc5e89b2a18932782 (patch)
tree65423546a6fe00c6413d0358d0a859593b6407d8 /package/network
parent636dc8750b883826596d23cf04f994ab3d127f3e (diff)
downloadupstream-9dcb3fe7eb06b42c4f026e6cc5e89b2a18932782.tar.gz
upstream-9dcb3fe7eb06b42c4f026e6cc5e89b2a18932782.tar.bz2
upstream-9dcb3fe7eb06b42c4f026e6cc5e89b2a18932782.zip
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>
Diffstat (limited to 'package/network')
-rw-r--r--package/network/services/samba36/Makefile2
-rw-r--r--package/network/services/samba36/files/smb.conf.template9
2 files changed, 3 insertions, 8 deletions
diff --git a/package/network/services/samba36/Makefile b/package/network/services/samba36/Makefile
index 8c2f6b0854..24d3f03001 100644
--- 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 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