Просмотр исходного кода

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]>
Rosen Penev 8 лет назад
Родитель
Сommit
b2f60e6a72

+ 1 - 1
package/network/services/samba36/Makefile

@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 
 PKG_NAME:=samba
 PKG_NAME:=samba
 PKG_VERSION:=3.6.25
 PKG_VERSION:=3.6.25
-PKG_RELEASE:=7
+PKG_RELEASE:=8
 
 
 PKG_SOURCE_URL:=https://download.samba.org/pub/samba \
 PKG_SOURCE_URL:=https://download.samba.org/pub/samba \
 		https://download.samba.org/pub/samba/stable
 		https://download.samba.org/pub/samba/stable

+ 1 - 6
package/network/services/samba36/files/samba.init

@@ -15,12 +15,7 @@ smb_header() {
 		for net in $samba_iface; do
 		for net in $samba_iface; do
 			local device
 			local device
 			network_is_up $net || continue
 			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} "
 			echo -n "${device:-$net} "
 		done
 		done
 	)
 	)