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 <[email protected]>
Acked-by: Kevin Darbyshire-Bryant <[email protected]>
(cherry picked from commit b2f60e6a7245c192703528a46dfb630c664dbc0c)

diff --git a/package/network/services/samba36/Makefile b/package/network/services/samba36/Makefile
index 24d3f030012c4434749ee86e297769b2ac498543..beb5f309cc114aab4f6579cc445d862e8d8bc5f9 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:=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 c8413243bac9806399b1763e1bb4cf6bba46c19d..28b0064df9895057976f6895546549dab4fb4bbe 100755 (executable)
--- 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
        )