From patchwork Tue Oct 13 16:07:44 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 3553 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4C9gTc6w9Zz3x1S for ; Tue, 13 Oct 2020 16:09:08 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4C9gSv2sfCz1L2; Tue, 13 Oct 2020 16:08:31 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4C9gSq55pgz305g; Tue, 13 Oct 2020 16:08:27 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4C9gSn5wTRz2y3n for ; Tue, 13 Oct 2020 16:08:25 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 4C9gSm4spGz1HY; Tue, 13 Oct 2020 16:08:24 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1602605304; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=3ckksluJ6qu43q6ltjF32/we5BPyJlb+afEcVdBygCg=; b=6cqyCanEsZvT5hAk6tugkkfoCZ1fVnpJA0ozQb80y6jLYTrepzuwqKbNjIDCsft/EjBq4R Z5tTQeQABcXeO3AA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1602605304; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=3ckksluJ6qu43q6ltjF32/we5BPyJlb+afEcVdBygCg=; b=eLDzvGxM62sGEHyCxq1izD2DASap6jtg3YXPGCOg/4YGY18xmXKog15b6bupz+kGNrn93m zQJEbal0pfujranJRpOhvrUoAM4+akPP/GK4GJPSN3e1QmBWSp6nRVT/aHI0ZrB0iEOEvS EfgbtUHcaOPFqBPu7hgh4ST6Q4U1Ks8UA7josQ6UObdhGZwe6k/m2GlY4fciaNgituafSQ O3hhneEiW+8NeXRDM6WsA7i5FBtzpSsTVf+G6SH8UC5o8MyDaN57Xip1GgSSqhXuHcVsod ffEXYB1ChNe2wnDm2pkRtbLCQ8njy2mCoc8R4XZsF4a22n4BsYwxu/DN3f6xOA== From: Michael Tremer 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> References: <20201013160812.27754-1-michael.tremer@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Tremer Errors-To: development-bounces@lists.ipfire.org Sender: "Development" This is no longer relevant since we cannot run in domain mode any longer. Signed-off-by: Michael Tremer --- 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 = '50'; ################################################## Samba PDC Variablen ##################################################### -$sambasettings{'PREFERREDMASTER'} = 'off'; my $PDCOPTIONS = `cat ${General::swroot}/samba/pdc`; @@ -149,7 +148,6 @@ delete $sambasettings{'__CGI__'};delete $sambasettings{'x'};delete $sambasetting &General::writehash("${General::swroot}/samba/settings", \%sambasettings); if ($sambasettings{'PASSWORDSYNC'} eq 'on'){ $sambasettings{'PASSWORDSYNC'} = "true";} else { $sambasettings{'PASSWORDSYNC'} = "false";} -if ($sambasettings{'PREFERREDMASTER'} eq 'on'){ $sambasettings{'PREFERREDMASTER'} = "true";} else { $sambasettings{'PREFERREDMASTER'} = "false";} if ($sambasettings{'WIDELINKS'} eq 'on'){ $sambasettings{'WIDELINKS'} = "yes";} else { $sambasettings{'WIDELINKS'} = "no";} if ($sambasettings{'UNIXEXTENSION'} eq 'on'){ $sambasettings{'UNIXEXTENSION'} = "yes";} else { $sambasettings{'UNIXEXTENSION'} = "no";} @@ -192,7 +190,6 @@ winbind use default domain = yes # Log to syslog logging = syslog -preferred master = $sambasettings{'PREFERREDMASTER'} END ; @@ -239,9 +236,6 @@ if ($message) { $checked{'PASSWORDSYNC'}{'off'} = ''; $checked{'PASSWORDSYNC'}{'on'} = ''; $checked{'PASSWORDSYNC'}{$sambasettings{'PASSWORDSYNC'}} = "checked='checked'"; -$checked{'PREFERREDMASTER'}{'off'} = ''; -$checked{'PREFERREDMASTER'}{'on'} = ''; -$checked{'PREFERREDMASTER'}{$sambasettings{'PREFERREDMASTER'}} = "checked='checked'"; $checked{'WIDELINKS'}{'off'} = ''; $checked{'WIDELINKS'}{'on'} = ''; $checked{'WIDELINKS'}{$sambasettings{'WIDELINKS'}} = "checked='checked'"; @@ -337,19 +331,6 @@ print <$Lang::tr{'os level'} $Lang::tr{'remote announce'} $Lang::tr{'remote browse sync'} -END -; - -if ($sambasettings{'SECURITY'} eq 'user') - { - print <$Lang::tr{'prefered master'}on / - off -END -; - } - -print <