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

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

This is no longer relevant since we cannot run in domain
mode any longer.

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

diff --git a/html/cgi-bin/samba.cgi b/html/cgi-bin/samba.cgi
index 2d9ebc367..062b4c85a 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{'PREFERREDMASTER'} =3D 'off';
 my $PDCOPTIONS =3D `cat ${General::swroot}/samba/pdc`;
=20
=20
@@ -149,7 +148,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{'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";}
=20
@@ -192,7 +190,6 @@ winbind use default domain =3D yes
 # Log to syslog
 logging =3D syslog
=20
-preferred master =3D $sambasettings{'PREFERREDMASTER'}
 END
 ;
=20
@@ -239,9 +236,6 @@ if ($message) {
 $checked{'PASSWORDSYNC'}{'off'} =3D '';
 $checked{'PASSWORDSYNC'}{'on'} =3D '';
 $checked{'PASSWORDSYNC'}{$sambasettings{'PASSWORDSYNC'}} =3D "checked=3D'che=
cked'";
-$checked{'PREFERREDMASTER'}{'off'} =3D '';
-$checked{'PREFERREDMASTER'}{'on'} =3D '';
-$checked{'PREFERREDMASTER'}{$sambasettings{'PREFERREDMASTER'}} =3D "checked=
=3D'checked'";
 $checked{'WIDELINKS'}{'off'} =3D '';
 $checked{'WIDELINKS'}{'on'} =3D '';
 $checked{'WIDELINKS'}{$sambasettings{'WIDELINKS'}} =3D "checked=3D'checked'";
@@ -337,19 +331,6 @@ print <<END
 <tr><td align=3D'left' width=3D'40%'>$Lang::tr{'os level'}</td><td align=3D'=
left'><input type=3D'text' name=3D'OSLEVEL' value=3D'$sambasettings{'OSLEVEL'=
}' size=3D"30" /></td></tr>
 <tr><td align=3D'left' width=3D'40%'>$Lang::tr{'remote announce'}</td><td al=
ign=3D'left'><input type=3D'text' name=3D'REMOTEANNOUNCE' value=3D'$sambasett=
ings{'REMOTEANNOUNCE'}' size=3D"30" /></td></tr>
 <tr><td align=3D'left' width=3D'40%'>$Lang::tr{'remote browse sync'}</td><td=
 align=3D'left'><input type=3D'text' name=3D'REMOTESYNC' value=3D'$sambasetti=
ngs{'REMOTESYNC'}' size=3D"30" /></td></tr>
-END
-;
-
-if ($sambasettings{'SECURITY'} eq 'user')
-	{
-	print <<END
-<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
-;
-	}
-
-print <<END
 </table>
 <br />
 <table width=3D'10%' cellspacing=3D'0'>
--=20
2.20.1


--===============5753986092967205495==--