From: Michael Tremer <michael.tremer@ipfire.org>
Date: Mon, 9 Nov 2020 18:43:15 +0000 (+0000)
Subject: samba: Add support for custom configuration changes
X-Git-Tag: v2.25-core152~1
X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=1e2c442c9e2d11590af214bdddde5cf0506e0a52

samba: Add support for custom configuration changes

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/config/backup/includes/samba b/config/backup/includes/samba
index 1d2166ca56..63d61a435d 100644
--- a/config/backup/includes/samba
+++ b/config/backup/includes/samba
@@ -4,3 +4,4 @@
 /var/ipfire/samba/settings
 /var/ipfire/samba/shares
 /var/ipfire/samba/smb.conf
+/var/ipfire/samba/smb.conf.local
diff --git a/html/cgi-bin/samba.cgi b/html/cgi-bin/samba.cgi
index ec41adc5dd..6a61300a2a 100644
--- a/html/cgi-bin/samba.cgi
+++ b/html/cgi-bin/samba.cgi
@@ -835,6 +835,18 @@ if ($sambasettings{'ENCRYPTION'} =~ m/(desired|required)/) {
 	print FILE "smb encrypt = $1\n";
 }
 
+# Include smb.conf.local
+if (-e "${General::swroot}/samba/smb.conf.local") {
+	open(LOCAL, "<${General::swroot}/samba/smb.conf.local");
+
+	# Copy content line by line
+	while (<LOCAL>) {
+		print FILE $_;
+	}
+
+	close(LOCAL);
+}
+
 print FILE <<END;
 # Export all printers
 [printers]
diff --git a/lfs/samba b/lfs/samba
index 92a6b11210..29dfec2e92 100644
--- a/lfs/samba
+++ b/lfs/samba
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = samba
-PAK_VER    = 73
+PAK_VER    = 74
 
 DEPS       = avahi cups libtirpc krb5 perl-Parse-Yapp