From: Rosen Penev <rosenp@gmail.com>
Date: Thu, 24 Aug 2017 23:51:24 +0000 (-0700)
Subject: samba36: Don't resolve interfaces.
X-Git-Tag: v18.06.0-rc1~2330
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=b2f60e6a7245c192703528a46dfb630c664dbc0c;p=oweals%2Fopenwrt.git

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>
---

diff --git a/package/network/services/samba36/Makefile b/package/network/services/samba36/Makefile
index 0762dd9307..81bad871aa 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 c8413243ba..28b0064df9 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
 	)