From mboxrd@z Thu Jan  1 00:00:00 1970
From: Michael Tremer <michael.tremer@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH 25/54] samba: Remove local master option
Date: Tue, 13 Oct 2020 16:07:43 +0000
Message-ID: <20201013160812.27754-25-michael.tremer@ipfire.org>
In-Reply-To: <20201013160812.27754-1-michael.tremer@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1293032122372323829=="
List-Id: <development.lists.ipfire.org>

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

It is not a good default to withdraw samba from the race of becoming
the local master browser. There is no reason why it couldn't be.

Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
 html/cgi-bin/samba.cgi | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/html/cgi-bin/samba.cgi b/html/cgi-bin/samba.cgi
index 2c2c506e5..2d9ebc367 100644
--- a/html/cgi-bin/samba.cgi
+++ b/html/cgi-bin/samba.cgi
@@ -92,7 +92,6 @@ my $LOGLINES =3D '50';
=20
 ################################################## Samba PDC Variablen #####=
################################################
=20
-$sambasettings{'LOCALMASTER'} =3D 'off';
 $sambasettings{'PREFERREDMASTER'} =3D 'off';
 my $PDCOPTIONS =3D `cat ${General::swroot}/samba/pdc`;
=20
@@ -150,7 +149,6 @@ delete $sambasettings{'__CGI__'};delete $sambasettings{'x=
'};delete $sambasetting
 &General::writehash("${General::swroot}/samba/settings", \%sambasettings);
=20
 if ($sambasettings{'PASSWORDSYNC'} eq 'on'){ $sambasettings{'PASSWORDSYNC'} =
=3D "true";} else { $sambasettings{'PASSWORDSYNC'} =3D "false";}
-if ($sambasettings{'LOCALMASTER'} eq 'on'){ $sambasettings{'LOCALMASTER'} =
=3D "true";} else { $sambasettings{'LOCALMASTER'} =3D "false";}
 if ($sambasettings{'PREFERREDMASTER'} eq 'on'){ $sambasettings{'PREFERREDMAS=
TER'} =3D "true";} else { $sambasettings{'PREFERREDMASTER'} =3D "false";}
 if ($sambasettings{'WIDELINKS'} eq 'on'){ $sambasettings{'WIDELINKS'} =3D "y=
es";} else { $sambasettings{'WIDELINKS'} =3D "no";}
 if ($sambasettings{'UNIXEXTENSION'} eq 'on'){ $sambasettings{'UNIXEXTENSION'=
} =3D "yes";} else { $sambasettings{'UNIXEXTENSION'} =3D "no";}
@@ -195,7 +193,6 @@ winbind use default domain =3D yes
 logging =3D syslog
=20
 preferred master =3D $sambasettings{'PREFERREDMASTER'}
-local master =3D $sambasettings{'LOCALMASTER'}
 END
 ;
=20
@@ -242,9 +239,6 @@ if ($message) {
 $checked{'PASSWORDSYNC'}{'off'} =3D '';
 $checked{'PASSWORDSYNC'}{'on'} =3D '';
 $checked{'PASSWORDSYNC'}{$sambasettings{'PASSWORDSYNC'}} =3D "checked=3D'che=
cked'";
-$checked{'LOCALMASTER'}{'off'} =3D '';
-$checked{'LOCALMASTER'}{'on'} =3D '';
-$checked{'LOCALMASTER'}{$sambasettings{'LOCALMASTER'}} =3D "checked=3D'check=
ed'";
 $checked{'PREFERREDMASTER'}{'off'} =3D '';
 $checked{'PREFERREDMASTER'}{'on'} =3D '';
 $checked{'PREFERREDMASTER'}{$sambasettings{'PREFERREDMASTER'}} =3D "checked=
=3D'checked'";
@@ -349,8 +343,6 @@ END
 if ($sambasettings{'SECURITY'} eq 'user')
 	{
 	print <<END
-<tr><td align=3D'left' width=3D'40%'>$Lang::tr{'local master'}</td><td align=
=3D'left'>on <input type=3D'radio' name=3D'LOCALMASTER' value=3D'on' $checked=
{'LOCALMASTER'}{'on'} />/
-																							<input type=3D'radio' name=3D'LOCALMASTER' value=3D'o=
ff' $checked{'LOCALMASTER'}{'off'} /> off</td></tr>
 <tr><td align=3D'left' width=3D'40%'>$Lang::tr{'prefered master'}</td><td al=
ign=3D'left'>on <input type=3D'radio' name=3D'PREFERREDMASTER' value=3D'on' $=
checked{'PREFERREDMASTER'}{'on'} />/
 																									<input type=3D'radio' name=3D'PREFERREDMASTER' valu=
e=3D'off' $checked{'PREFERREDMASTER'}{'off'} /> off</td></tr>
 END
--=20
2.20.1


--===============1293032122372323829==--