From mboxrd@z Thu Jan  1 00:00:00 1970
From: Michael Tremer <git@ipfire.org>
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, master, updated.
 1e2c442c9e2d11590af214bdddde5cf0506e0a52
Date: Mon, 09 Nov 2020 18:46:15 +0000
Message-ID: <4CVKhR2hC5z2xcH@people01.haj.ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============3676625495603538936=="
List-Id: <ipfire-scm.lists.ipfire.org>

--===============3676625495603538936==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, master has been updated
       via  1e2c442c9e2d11590af214bdddde5cf0506e0a52 (commit)
      from  0e42d81285766431f20bd92218d9c427162c96dc (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 1e2c442c9e2d11590af214bdddde5cf0506e0a52
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Mon Nov 9 18:43:15 2020 +0000

    samba: Add support for custom configuration changes
   =20
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

-----------------------------------------------------------------------

Summary of changes:
 config/backup/includes/samba |  1 +
 html/cgi-bin/samba.cgi       | 12 ++++++++++++
 lfs/samba                    |  2 +-
 3 files changed, 14 insertions(+), 1 deletion(-)

Difference in files:
diff --git a/config/backup/includes/samba b/config/backup/includes/samba
index 1d2166ca5..63d61a435 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 ec41adc5d..6a61300a2 100644
--- a/html/cgi-bin/samba.cgi
+++ b/html/cgi-bin/samba.cgi
@@ -835,6 +835,18 @@ if ($sambasettings{'ENCRYPTION'} =3D~ m/(desired|require=
d)/) {
 	print FILE "smb encrypt =3D $1\n";
 }
=20
+# 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 92a6b1121..29dfec2e9 100644
--- a/lfs/samba
+++ b/lfs/samba
@@ -32,7 +32,7 @@ DL_FROM    =3D $(URL_IPFIRE)
 DIR_APP    =3D $(DIR_SRC)/$(THISAPP)
 TARGET     =3D $(DIR_INFO)/$(THISAPP)
 PROG       =3D samba
-PAK_VER    =3D 73
+PAK_VER    =3D 74
=20
 DEPS       =3D avahi cups libtirpc krb5 perl-Parse-Yapp
=20


hooks/post-receive
--
IPFire 2.x development tree

--===============3676625495603538936==--