From mboxrd@z Thu Jan  1 00:00:00 1970
From: Michael Tremer <michael.tremer@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH 53/54] samba: Allow rewriting configuration from CLI
Date: Tue, 13 Oct 2020 16:08:11 +0000
Message-ID: <20201013160812.27754-53-michael.tremer@ipfire.org>
In-Reply-To: <20201013160812.27754-1-michael.tremer@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============6222255821827096080=="
List-Id: <development.lists.ipfire.org>

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

Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
 html/cgi-bin/samba.cgi    | 152 ++++++++++++++++++++------------------
 src/paks/samba/install.sh |  12 +--
 2 files changed, 82 insertions(+), 82 deletions(-)

diff --git a/html/cgi-bin/samba.cgi b/html/cgi-bin/samba.cgi
index ec1237134..be670a95e 100644
--- a/html/cgi-bin/samba.cgi
+++ b/html/cgi-bin/samba.cgi
@@ -50,11 +50,6 @@ my %shares =3D ();
 &General::readhash("${General::swroot}/main/settings", \%mainsettings);
 &General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/i=
nclude/colors.txt", \%color);
=20
-############################################################################=
################################################
-############################################# Samba Dienste fr Statusberprfu=
ng ##########################################
-
-&Header::showhttpheaders();
-
 ############################################################################=
################################################
 #################################### Initialisierung von Samba Variablen fr =
global Settings ###############################
=20
@@ -72,7 +67,17 @@ my $LOGLINES =3D '50';
 ############################################################################=
################################################
=20
 &General::readhash("${General::swroot}/samba/settings", \%sambasettings);
+
+# Hook to regenerate the configuration files.
+if ($ENV{"REMOTE_ADDR"} eq "") {
+	&writeconfiguration();
+	exit(0);
+}
+
+&Header::showhttpheaders();
+
 &Header::getcgihash(\%sambasettings);
+delete $sambasettings{'__CGI__'};delete $sambasettings{'x'};delete $sambaset=
tings{'y'};
=20
 &Header::openpage('Samba', 1, '');
 &Header::openbigbox('100%', 'left', '', $errormessage);
@@ -100,81 +105,19 @@ if ($sambasettings{'ACTION'} eq 'userdelete'){system("/=
usr/local/bin/sambactrl s
 ############################################################################=
################################################
 ##################################### Umsetzen der Werte von Checkboxen und =
Dropdowns ######################################
=20
-if ($sambasettings{'ACTION'} eq $Lang::tr{'save'})
-{
 ############################################################################=
################################################
 ##################################### Schreiben settings und bersetzen fr sm=
b.conf #######################################
=20
-delete $sambasettings{'__CGI__'};delete $sambasettings{'x'};delete $sambaset=
tings{'y'};
-&General::writehash("${General::swroot}/samba/settings", \%sambasettings);
-
-############################################################################=
################################################
-############################################# Schreiben der Samba globals ##=
################################################
-
-	open (FILE, ">${General::swroot}/samba/global") or die "Can't save the glob=
al settings: $!";
-	flock (FILE, 2);
-=09
-print FILE <<END
-# global.settings by IPFire Project
-
-[global]
-server string =3D Samba on IPFire
+if ($sambasettings{'ACTION'} eq $Lang::tr{'save'}) {
+	&General::writehash("${General::swroot}/samba/settings", \%sambasettings);
=20
-workgroup =3D $sambasettings{'WORKGRP'}
-realm =3D $mainsettings{'DOMAINNAME'}
-passdb backend =3D smbpasswd
+	# Write configuration to file
+	&writeconfiguration();
=20
-map to guest =3D $sambasettings{'MAPTOGUEST'}
-
-guest account =3D $sambasettings{'GUESTACCOUNT'}
-unix password sync =3D no
-
-bind interfaces only =3D true
-interfaces =3D green0 blue0 127.0.0.0/8
-remote announce =3D $sambasettings{'REMOTEANNOUNCE'}
-remote browse sync =3D $sambasettings{'REMOTESYNC'}
-
-winbind separator =3D +
-winbind uid =3D 10000-20000
-winbind gid =3D 10000-20000
-winbind use default domain =3D yes
-
-# Log to syslog
-logging =3D syslog
-
-# Enable support for Apple
-vfs objects =3D catia fruit streams_xattr recycle
-
-# Enable following symlinks
-wide links =3D yes
-
-END
-;
-
-# Server Role
-if ($sambasettings{'ROLE'} eq "standalone") {
-	print FILE "server role =3D standalone\n";
-} elsif ($sambasettings{'ROLE'} eq "member") {
-	print FILE "server role =3D member server\n";
-}
-
-if ($sambasettings{'ENCRYPTION'} =3D~ m/(desired|required)/) {
-	print FILE "smb encrypt =3D $1\n";
+	system("/usr/local/bin/sambactrl smbreload");
 }
=20
-print FILE <<END;
-# Export all printers
-[printers]
-path =3D /var/spool/samba/
-printable =3D yes
-
-END
-close FILE;
-
-system("/usr/local/bin/sambactrl smbsafeconf");
-system("/usr/local/bin/sambactrl smbreload");
-}
-  &General::readhash("${General::swroot}/samba/settings", \%sambasettings);
+&General::readhash("${General::swroot}/samba/settings", \%sambasettings);
  =20
=20
 if ($errormessage)
@@ -838,6 +781,69 @@ sub isrunning
 	return $status;
 	}
=20
+sub writeconfiguration() {
+	open (FILE, ">${General::swroot}/samba/global") or die "Can't save the glob=
al settings: $!";
+	flock (FILE, 2);
+=09
+	print FILE <<END;
+# global.settings by IPFire Project
+
+[global]
+server string =3D Samba on IPFire
+
+workgroup =3D $sambasettings{'WORKGRP'}
+realm =3D $mainsettings{'DOMAINNAME'}
+passdb backend =3D smbpasswd
+
+map to guest =3D $sambasettings{'MAPTOGUEST'}
+
+guest account =3D $sambasettings{'GUESTACCOUNT'}
+unix password sync =3D no
+
+bind interfaces only =3D true
+interfaces =3D green0 blue0 127.0.0.0/8
+remote announce =3D $sambasettings{'REMOTEANNOUNCE'}
+remote browse sync =3D $sambasettings{'REMOTESYNC'}
+
+winbind separator =3D +
+winbind uid =3D 10000-20000
+winbind gid =3D 10000-20000
+winbind use default domain =3D yes
+
+# Log to syslog
+logging =3D syslog
+
+# Enable support for Apple
+vfs objects =3D catia fruit streams_xattr recycle
+
+# Enable following symlinks
+wide links =3D yes
+
+END
+
+# Server Role
+if ($sambasettings{'ROLE'} eq "standalone") {
+	print FILE "server role =3D standalone\n";
+} elsif ($sambasettings{'ROLE'} eq "member") {
+	print FILE "server role =3D member server\n";
+}
+
+if ($sambasettings{'ENCRYPTION'} =3D~ m/(desired|required)/) {
+	print FILE "smb encrypt =3D $1\n";
+}
+
+print FILE <<END;
+# Export all printers
+[printers]
+path =3D /var/spool/samba/
+printable =3D yes
+
+END
+close FILE;
+
+	system("/usr/local/bin/sambactrl smbsafeconf");
+}
+
 sub joindomain {
 	my $username =3D shift;
 	my $password =3D shift;
diff --git a/src/paks/samba/install.sh b/src/paks/samba/install.sh
index 22d74b93a..06a5b0358 100644
--- a/src/paks/samba/install.sh
+++ b/src/paks/samba/install.sh
@@ -33,15 +33,6 @@ fi
 extract_files
 restore_backup ${NAME}
=20
-# Migrate configuration from Samba 3.6 to 4.x
-sed -i /var/ipfire/samba/smb.conf \
-	-e "/^display charset =3D/d" \
-	-e "/^encrypt passwords =3D/d" \
-	-e "/^null passwords =3D/d" \
-	-e "/^socket options =3D/d" \
-	-e "/^syslog/d" \
-	-e "s/^security =3D share$/security =3D user/"
-
 # Migrate SECURITY to ROLE
 sed -i /var/ipfire/samba/settings \
 	-e "s/^SECURITY=3DADS/ROLE=3Dmember/" \
@@ -49,5 +40,8 @@ sed -i /var/ipfire/samba/settings \
 	-e "s/^SECURITY=3Dshare/ROLE=3Dstandalone/" \
 	-e "s/^SECURITY=3Duser/ROLE=3Dstandalone/"
=20
+# Rewrite configuration files
+sudo -u nobody /srv/web/ipfire/cgi-bin/samba.cgi
+
 # Start the service
 /usr/local/bin/sambactrl smbstart
--=20
2.20.1


--===============6222255821827096080==--