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 1d2166ca56ebd92b7226695a132e79651d693f09..63d61a435d751c7e1a0b591aed7ccfcb87f7336b 100644 (file)
--- 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 ec41adc5dd0506b986897074567989902e2b8fc5..6a61300a2ae93b23006f99091048445c7f8336dd 100644 (file)
--- 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 92a6b11210f0b15fdbc8e081617490a72eae2838..29dfec2e92e985f814d7fea82b1d3079216ab017 100644 (file)
--- 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