From patchwork Tue Oct 13 16:07:32 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 3540 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 4C9gSx4HS3z3x5t for ; Tue, 13 Oct 2020 16:08:33 +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 4C9gSm0DFcz1GG; Tue, 13 Oct 2020 16:08:24 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4C9gSj2ztrz305N; Tue, 13 Oct 2020 16:08:21 +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 4C9gSg49Fvz304k for ; Tue, 13 Oct 2020 16:08:19 +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 4C9gSg34ZBzlb; Tue, 13 Oct 2020 16:08:19 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1602605299; 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=Bwk7F3tiJgXF46TCOOBFZu3fBdjLb1zOG01yq8mHZOk=; b=Ec5PYUEOazktpI5ToDord0d8EPlXn5A+zbaafe/DX4Ri/f9ejgXC+lHESAYeQf+XK5bpnX 2mp41bazdmHfQ+Cg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1602605299; 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=Bwk7F3tiJgXF46TCOOBFZu3fBdjLb1zOG01yq8mHZOk=; b=OC647qDft0kl+nv7+1fW6jWe1echf7kv3djRTxMAh4o7+mUe2sLvv4SD7iCgPf9j6nGttq g2zLlC9UlXhPyvvz2Wc4SBXICISgib6lNDkyKiKiRYe4qhgOJkDrYwApqmd9HuWfZxtDrg nWynGwfADrI9kywqhEzGGg8idx217x3XCZkfEEX0gkD2ebAYzNw2a278HCY/IjjnGXkXkc E/TIKszrhBTH37RDQQRaig/LUIgp3LTReofQ6vhsHaeiEiyX3qRK8YpDH4snEFyZw1nf4h XdCImuXYbwpMVahRh75GjyrwZiXDeK7o6uFMF2aihju75704ujSgbAAT7j9AxQ== From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 14/54] samba: Remove limitation that server only uses SMB2 Date: Tue, 13 Oct 2020 16:07:32 +0000 Message-Id: <20201013160812.27754-14-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 | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/html/cgi-bin/samba.cgi b/html/cgi-bin/samba.cgi index 0beb24241..2e0ddc7f2 100644 --- a/html/cgi-bin/samba.cgi +++ b/html/cgi-bin/samba.cgi @@ -93,7 +93,6 @@ $sambasettings{'MAPTOGUEST'} = 'Bad User'; $sambasettings{'LOGLEVEL'} = '3 passdb:5 auth:5 winbind:2'; $sambasettings{'WIDELINKS'} = 'on'; $sambasettings{'UNIXEXTENSION'} = 'off'; -$sambasettings{'SMB2'} = 'on'; ### Values that have to be initialized $sambasettings{'ACTION'} = ''; ### Samba CUPS Variablen @@ -169,7 +168,6 @@ if ($sambasettings{'ACTION'} eq 'globalresetyes') $sambasettings{'PREFERREDMASTER'} = 'off'; $sambasettings{'WIDELINKS'} = 'on'; $sambasettings{'UNIXEXTENSION'} = 'off'; - $sambasettings{'SMB2'} = 'on'; $PDCOPTIONS = `cat ${General::swroot}/samba/pdc`; system("/usr/local/bin/sambactrl smbreload"); refreshpage(); @@ -267,14 +265,6 @@ passdb backend = smbpasswd wide links = $sambasettings{'WIDELINKS'} unix extensions = $sambasettings{'UNIXEXTENSION'} -END -; - -if ($sambasettings{'SMB2'} eq 'on'){ - print FILE "max protocol = smb2\n"; -} - -print FILE < off Unix extensionon / off -SMB2 $Lang::tr{'protocol'}on / - off
$Lang::tr{'security options'} $Lang::tr{'security'}