From patchwork Tue Oct 13 16:07:43 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 3551 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 4C9gTX6SGHz3x3M for ; Tue, 13 Oct 2020 16:09:04 +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 4C9gSv2gdvz1JH; 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 4C9gSq4V5Mz304N; 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 4C9gSn4VT7z2y3n 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 4C9gSm31wRz1Gj; 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=uw0iJ9RstgTPvxmfPe6f0xHwbr0dDlDyi1ysbg5+Go8=; b=FzpP9W/NmjothjZPDAaChqoR4ml2vVeEFDm4u67CmLqUr0/6PrrtjrIRXeXojaU7PAStVG TwCX839rW8C6WgCw== 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=uw0iJ9RstgTPvxmfPe6f0xHwbr0dDlDyi1ysbg5+Go8=; b=OVEGDDuXR0PzzHAxojbRMVMbjomltwul73TYADh7aVRLPpHkEVmyo2tEiGJAdk7GNUEIu6 yZchZJgTw5bVwf3I8NmPgPVuzCvfs3dRxxFjWYSqu+drindgFA9LxRM3YsJlYxSdTorGFz 5meE8/8cMzKIwVxls8PmWnPDtInh0I6QEEfyrcv53qSddw8FVRMrbs8KKg/1sjxyszfH3A runk8VeJvkNVG39G5S6oH8+nHliVZfu97aOu30Qls8t+S5LAMhctHJGfH/Mge8RXDK0p2e N/GsRu2Y7ZHgAE0lmyj2ADlJTzyyLYDkbVWYdl5cmrx2b/e0GUWRs8Ecc/yP2A== From: Michael Tremer 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> 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" 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 --- 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 = '50'; ################################################## Samba PDC Variablen ##################################################### -$sambasettings{'LOCALMASTER'} = 'off'; $sambasettings{'PREFERREDMASTER'} = 'off'; my $PDCOPTIONS = `cat ${General::swroot}/samba/pdc`; @@ -150,7 +149,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{'LOCALMASTER'} eq 'on'){ $sambasettings{'LOCALMASTER'} = "true";} else { $sambasettings{'LOCALMASTER'} = "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";} @@ -195,7 +193,6 @@ winbind use default domain = yes logging = syslog preferred master = $sambasettings{'PREFERREDMASTER'} -local master = $sambasettings{'LOCALMASTER'} END ; @@ -242,9 +239,6 @@ if ($message) { $checked{'PASSWORDSYNC'}{'off'} = ''; $checked{'PASSWORDSYNC'}{'on'} = ''; $checked{'PASSWORDSYNC'}{$sambasettings{'PASSWORDSYNC'}} = "checked='checked'"; -$checked{'LOCALMASTER'}{'off'} = ''; -$checked{'LOCALMASTER'}{'on'} = ''; -$checked{'LOCALMASTER'}{$sambasettings{'LOCALMASTER'}} = "checked='checked'"; $checked{'PREFERREDMASTER'}{'off'} = ''; $checked{'PREFERREDMASTER'}{'on'} = ''; $checked{'PREFERREDMASTER'}{$sambasettings{'PREFERREDMASTER'}} = "checked='checked'"; @@ -349,8 +343,6 @@ END if ($sambasettings{'SECURITY'} eq 'user') { print <$Lang::tr{'local master'}on / - off $Lang::tr{'prefered master'}on / off END