From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 24/54] samba: Drop support for being PDC for Windows NT domains Date: Tue, 13 Oct 2020 16:07:42 +0000 Message-ID: <20201013160812.27754-24-michael.tremer@ipfire.org> In-Reply-To: <20201013160812.27754-1-michael.tremer@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============7494728970499278758==" List-Id: --===============7494728970499278758== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable This is outdated, and nobody uses it Signed-off-by: Michael Tremer --- html/cgi-bin/samba.cgi | 119 +++++------------------------------------ 1 file changed, 13 insertions(+), 106 deletions(-) diff --git a/html/cgi-bin/samba.cgi b/html/cgi-bin/samba.cgi index 902ae6eac..2c2c506e5 100644 --- a/html/cgi-bin/samba.cgi +++ b/html/cgi-bin/samba.cgi @@ -93,7 +93,6 @@ my $LOGLINES =3D '50'; ################################################## Samba PDC Variablen #####= ################################################ =20 $sambasettings{'LOCALMASTER'} =3D 'off'; -$sambasettings{'DOMAINMASTER'} =3D 'off'; $sambasettings{'PREFERREDMASTER'} =3D 'off'; my $PDCOPTIONS =3D `cat ${General::swroot}/samba/pdc`; =20 @@ -152,7 +151,6 @@ delete $sambasettings{'__CGI__'};delete $sambasettings{'x= '};delete $sambasetting =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{'DOMAINMASTER'} eq 'on'){ $sambasettings{'DOMAINMASTER'} = =3D "true";} else { $sambasettings{'DOMAINMASTER'} =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";} @@ -197,7 +195,6 @@ winbind use default domain =3D yes logging =3D syslog =20 preferred master =3D $sambasettings{'PREFERREDMASTER'} -domain master =3D $sambasettings{'DOMAINMASTER'} local master =3D $sambasettings{'LOCALMASTER'} END ; @@ -215,27 +212,9 @@ printable =3D yes END close FILE; =20 -if ($sambasettings{'SECURITY'} eq 'user' && $sambasettings{'DOMAINMASTER'} e= q 'true' ) - { - open (FILE, ">${General::swroot}/samba/pdc") or die "Can't save the pdc set= tings: $!"; - flock (FILE, 2); - chomp $sambasettings{'PDCOPTIONS'}; - $sambasettings{'PDCOPTIONS'} =3D~ s/\r\n/\n/gi; - $sambasettings{'PDCOPTIONS'} =3D~ s/^\n//gi; - $sambasettings{'PDCOPTIONS'} =3D~ s/^\r//gi; - $sambasettings{'PDCOPTIONS'} =3D~ s/^.\n//gi; - $sambasettings{'PDCOPTIONS'} =3D~ s/^.\r//gi; - print FILE < $Lang:= :tr{'basic options'} $Lang::tr{'workgroup'} -print <
Wide linkson off @@ -346,7 +321,6 @@ print <$Lang:= :tr{'security options'} $Lang::tr{'security'} @@ -377,25 +351,12 @@ if ($sambasettings{'SECURITY'} eq 'user') print <$Lang::tr{'local master'}on / off -$Lang::tr{'domain master'}on / - off $Lang::tr{'prefered master'}on / off END ; } =20 -if ($sambasettings{'SECURITY'} eq 'user' && $sambasettings{'DOMAINMASTER'} e= q 'on') - { - print <
- $Lang= ::tr{'pdc options'} -
- -END -; - } -=09 print <
@@ -430,14 +391,7 @@ END =20 if ($sambasettings{'SECURITY'} eq 'user') { - if ($sambasettings{'DOMAINMASTER'} eq 'off') - { - &Header::openbox('100%', 'center', $Lang::tr{'accounting user nonpdc'}); - } - else - { - &Header::openbox('100%', 'center', $Lang::tr{'accounting user pdc'}); - } + &Header::openbox('100%', 'center', $Lang::tr{'user management'}); print <
@@ -448,15 +402,7 @@ if ($sambasettings{'SECURITY'} eq 'user') END ; =20 - if ($sambasettings{'DOMAINMASTER'} eq 'off') - { - print ""; - } - else - { - print "$Lang::tr{'type'}"; - } - + print ""; print "$Lang::tr{'status'}$Lang::tr{'options'}"; system('/usr/local/bin/sambactrl readsmbpasswd'); open(FILE, "<${General::swroot}/samba/private/smbpasswd") or die "Can't rea= d user file: $!"; @@ -480,21 +426,7 @@ END print "$Lang::tr{'set'}"; } =20 - if ($sambasettings{'DOMAINMASTER'} eq 'off') - { - print ""; - } - else - { - if ($userline[0] =3D~ /\$/) - { - print "$Lang::tr{'pc'}"; - } - else - { - print "$Lang::tr{'user'}"; - } - } + print ""; =20 if ($userline[4] =3D~ /D/) { @@ -537,28 +469,14 @@ END ; } =20 - if ($sambasettings{'DOMAINMASTER'} eq 'on' && $userline[0] =3D~ /\$/) - { - print <
- - - -
-END -; - } - else - { - print <
- - - -
+ print <
+ + + +
END ; - } $lines++; } print <
- -
-END -; - } print <
@@ -930,9 +839,7 @@ if ( $smb eq 'shares') =20 close FILE; =20 -if ( $sambasettings{'SECURITY'} eq 'user' && $sambasettings{'DOMAINMASTER'} = eq 'true' ){system("/usr/local/bin/sambactrl smbsafeconfpdc");} - else{system("/usr/local/bin/sambactrl smbsafeconf");} - +system("/usr/local/bin/sambactrl smbsafeconf"); system("/usr/local/bin/sambactrl smbreload"); refreshpage(); } --=20 2.20.1 --===============7494728970499278758==--