From: Andy Walsh <andy.walsh44+github@gmail.com>
Date: Fri, 22 Nov 2019 13:15:12 +0000 (+0100)
Subject: samba4: add UCI option 'disable_async_io'
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=5b2010ce80afd1559804bcea9ccba3169d8bb46b;p=feed%2Fpackages.git

samba4: add UCI option 'disable_async_io'

* add UCI option 'disable_async_io'
* remove [homes] options

Signed-off-by: Andy Walsh <andy.walsh44+github@gmail.com>
---

diff --git a/net/samba4/Makefile b/net/samba4/Makefile
index 966596dbbd..7c98181463 100644
--- a/net/samba4/Makefile
+++ b/net/samba4/Makefile
@@ -3,7 +3,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=samba
 PKG_VERSION:=4.9.15
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://ftp.heanet.ie/mirrors/ftp.samba.org/stable/ \
diff --git a/net/samba4/files/samba.config b/net/samba4/files/samba.config
index 332bb27914..38983aa91a 100644
--- a/net/samba4/files/samba.config
+++ b/net/samba4/files/samba.config
@@ -2,5 +2,3 @@ config samba
 	option 'workgroup'		'WORKGROUP'
 	option 'description'	'Samba on OpenWrt'
 	option 'charset' 		'UTF-8'
-	option 'homes'			'0'
-
diff --git a/net/samba4/files/samba.init b/net/samba4/files/samba.init
index 39686e6cd4..5b81db2c4b 100644
--- a/net/samba4/files/samba.init
+++ b/net/samba4/files/samba.init
@@ -33,6 +33,7 @@ smb_header() {
 	config_get_bool DISABLE_NETBIOS	$1 disable_netbios	0
 	config_get_bool DISABLE_AD_DC	$1 disable_ad_dc	0
 	config_get_bool DISABLE_WINBIND	$1 disable_winbind	0
+	config_get_bool DISABLE_ASYNC_IO $1 disable_async_io	0
 
 	mkdir -p /var/etc
 	sed -e "s#|NAME|#$hostname#g" \
@@ -47,20 +48,13 @@ smb_header() {
 		if [ "$DISABLE_NETBIOS" -eq 1 ] || [ ! -x /usr/sbin/nmbd ]; then
 			printf "\tdisable netbios = yes\n"
 		fi
-
-		local homes
-		config_get_bool homes $1 homes 0
-		[ $homes -gt 0 ] && {
-			cat <<EOT
-
-[homes]
-	comment     = Home Directories
-	browsable   = no
-	writable = yes
-	read only   = no
-	create mask = 0750
-EOT
-		}
+		
+		if [ "$DISABLE_ASYNC_IO" -eq 1 ]; then
+			printf "\taio read size = 0\n"
+			printf "\taio write size = 0\n"
+			# sendfile bug: https://bugzilla.samba.org/show_bug.cgi?id=14095
+			printf "\tuse sendfile = no\n"
+		fi
 	} >> /var/etc/smb.conf
 
 	[ -e /etc/samba/smb.conf ] || ln -nsf /var/etc/smb.conf /etc/samba/smb.conf