diff options
| author | Rosen Penev <rosenp@gmail.com> | 2017-08-24 16:51:24 -0700 |
|---|---|---|
| committer | Jo-Philipp Wich <jo@mein.io> | 2017-12-13 16:29:22 +0100 |
| commit | 71797b6eca358003cb994a906667a867d4b508d4 (patch) | |
| tree | 54ecedd6ba9ed495750792b084e6e082ef22dbb3 | |
| parent | 1458bc2d9c7ce9a0cdd4d2514b18bbc8adf22d7a (diff) | |
| download | upstream-71797b6eca358003cb994a906667a867d4b508d4.tar.gz upstream-71797b6eca358003cb994a906667a867d4b508d4.tar.bz2 upstream-71797b6eca358003cb994a906667a867d4b508d4.zip | |
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)
| -rw-r--r-- | package/network/services/samba36/Makefile | 2 | ||||
| -rwxr-xr-x | package/network/services/samba36/files/samba.init | 7 |
2 files changed, 2 insertions, 7 deletions
diff --git a/package/network/services/samba36/Makefile b/package/network/services/samba36/Makefile index 24d3f03001..beb5f309cc 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 ) |