webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-27 03:07:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into next

Browse Source 
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
This commit is contained in:
Arne Fitzenreiter
2020-11-13 18:20:59 +00:00
parent 11b46800a5 1e2c442c9e
commit a832b5c2e6
7 changed files with 22 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
html/cgi-bin/samba.cgi
View File

@@ -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]