From patchwork Tue Oct 13 16:07:48 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 3558 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 4C9gTq0Xcdz3x1S for ; Tue, 13 Oct 2020 16:09:19 +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 4C9gSw4qz1z1RQ; Tue, 13 Oct 2020 16:08:32 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4C9gSt0lwyz3051; Tue, 13 Oct 2020 16:08:30 +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 4C9gSr0GMNz305d for ; Tue, 13 Oct 2020 16:08:28 +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 4C9gSp0v39z1Hr; Tue, 13 Oct 2020 16:08:26 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1602605306; 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=QlB0TW4trPmI0VG40Uv5sEi2P2hMXNPHshtVYD1GmwY=; b=WfINqqoDmpcN6ZRtlrBLOTEjdKzcVARhm13C/jhk3royefLti4SMQAuHXd+yqLFIW4vDf2 sWzNwWrWrbTwHSBg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1602605306; 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=QlB0TW4trPmI0VG40Uv5sEi2P2hMXNPHshtVYD1GmwY=; b=CQMn26sHNn7dAkSKDs/T0FxKCsawur0NVFaL1NunMVgYXlervlHuSqFAWt3LQMlncedAn3 k9b7d0CXI7C9nUfmchILBhQNgHciWgMsv60QPlUNLkyma6Ct8bak1f5IdU1zJk/AYCJQlB VWvEK0462xQmZN28WC73riquuQx8Tm+V6NhqKxkGJVvo90voYfZ0FTms0mtysOmdm9G+kG w9jgPIu/ELIXNA8v8xZeJip8HOF53pcxg+nsBCQadsFfMK4cnUY/PqIHd5s+FUQq5s7Tl0 uvbzSWbZUfrd6wDTevta2CiyYBMy8wn04fXcSWRjs6OlMkvSqwT6FOhA70J/Ig== From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 30/54] samba: Remove un-exported password sync option Date: Tue, 13 Oct 2020 16:07:48 +0000 Message-Id: <20201013160812.27754-30-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" Signed-off-by: Michael Tremer --- html/cgi-bin/samba.cgi | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/html/cgi-bin/samba.cgi b/html/cgi-bin/samba.cgi index 5d0d95b38..b8ea18857 100644 --- a/html/cgi-bin/samba.cgi +++ b/html/cgi-bin/samba.cgi @@ -68,7 +68,6 @@ $sambasettings{'INTERFACES'} = ''; $sambasettings{'SECURITY'} = 'user'; $sambasettings{'REMOTEANNOUNCE'} = ''; $sambasettings{'REMOTESYNC'} = ''; -$sambasettings{'PASSWORDSYNC'} = 'off'; $sambasettings{'GUESTACCOUNT'} = 'samba'; $sambasettings{'MAPTOGUEST'} = 'Bad User'; $sambasettings{'WIDELINKS'} = 'on'; @@ -123,7 +122,6 @@ if ($sambasettings{'ACTION'} eq $Lang::tr{'save'}) delete $sambasettings{'__CGI__'};delete $sambasettings{'x'};delete $sambasettings{'y'}; &General::writehash("${General::swroot}/samba/settings", \%sambasettings); -if ($sambasettings{'PASSWORDSYNC'} eq 'on'){ $sambasettings{'PASSWORDSYNC'} = "true";} else { $sambasettings{'PASSWORDSYNC'} = "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";} @@ -150,7 +148,7 @@ map to guest = $sambasettings{'MAPTOGUEST'} security = $sambasettings{'SECURITY'} guest account = $sambasettings{'GUESTACCOUNT'} -unix password sync = $sambasettings{'PASSWORDSYNC'} +unix password sync = no bind interfaces only = true interfaces = green0 blue0 127.0.0.0/8 @@ -208,9 +206,6 @@ if ($message) { ############################################################################################################################ ########################################## Aktivieren von Checkboxen und Dropdowns ######################################### -$checked{'PASSWORDSYNC'}{'off'} = ''; -$checked{'PASSWORDSYNC'}{'on'} = ''; -$checked{'PASSWORDSYNC'}{$sambasettings{'PASSWORDSYNC'}} = "checked='checked'"; $checked{'WIDELINKS'}{'off'} = ''; $checked{'WIDELINKS'}{'on'} = ''; $checked{'WIDELINKS'}{$sambasettings{'WIDELINKS'}} = "checked='checked'"; @@ -284,11 +279,6 @@ print <Bad User -END -; -#$Lang::tr{'unix password sync'}on / -# off -print <
$Lang::tr{'network options'} $Lang::tr{'remote announce'}