summaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
authorRosen Penev <rosenp@gmail.com>2017-08-24 16:51:24 -0700
committerJo-Philipp Wich <jo@mein.io>2017-12-13 16:29:22 +0100
commit71797b6eca358003cb994a906667a867d4b508d4 (patch)
tree54ecedd6ba9ed495750792b084e6e082ef22dbb3 /package
parent1458bc2d9c7ce9a0cdd4d2514b18bbc8adf22d7a (diff)
downloadmtk-20170518-71797b6eca358003cb994a906667a867d4b508d4.zip
mtk-20170518-71797b6eca358003cb994a906667a867d4b508d4.tar.gz
mtk-20170518-71797b6eca358003cb994a906667a867d4b508d4.tar.bz2
samba36: Don't resolve interfaces.
It's redundant and also buggy. IPv6 link local addresses and ::1 are not resolved for example. Doesn't matter since lo and br-lan for example, resolve to them. Signed-off-by: Rosen Penev <rosenp@gmail.com> Acked-by: Kevin Darbyshire-Bryant <kevin@darbyshire-bryant.me.uk> (cherry picked from commit b2f60e6a7245c192703528a46dfb630c664dbc0c)
Diffstat (limited to 'package')
-rw-r--r--package/network/services/samba36/Makefile2
-rwxr-xr-xpackage/network/services/samba36/files/samba.init7
2 files changed, 2 insertions, 7 deletions
diff --git a/package/network/services/samba36/Makefile b/package/network/services/samba36/Makefile
index 24d3f03..beb5f30 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:=7
+PKG_RELEASE:=8
PKG_SOURCE_URL:=https://download.samba.org/pub/samba \
https://download.samba.org/pub/samba/stable
diff --git a/package/network/services/samba36/files/samba.init b/package/network/services/samba36/files/samba.init
index c841324..28b0064 100755
--- a/package/network/services/samba36/files/samba.init
+++ b/package/network/services/samba36/files/samba.init
@@ -15,12 +15,7 @@ smb_header() {
for net in $samba_iface; do
local device
network_is_up $net || continue
- network_get_device device "$net" && {
- local subnet
- network_get_subnet subnet "$net" && echo -n "$subnet "
- network_get_subnet6 subnet "$net" && echo -n "$subnet "
- }
-
+ network_get_device device "$net"
echo -n "${device:-$net} "
done
)