From patchwork Tue Oct 13 16:07:41 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 3548 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 4C9gTR70W8z3x1S for ; Tue, 13 Oct 2020 16:08:59 +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 4C9gSs3qXkz1KX; Tue, 13 Oct 2020 16:08:29 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4C9gSp2JSnz305H; Tue, 13 Oct 2020 16:08:26 +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 4C9gSm336Rz2xZt for ; Tue, 13 Oct 2020 16:08:24 +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 4C9gSl287yz1Cb; Tue, 13 Oct 2020 16:08:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1602605303; 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=Yk9/xsWpN+izJ6I1DpgXP2LR+S+kXFd4Rn6xEwt493Y=; b=eU4y/qEXECmy1qcGFGNxUh4a5l/4B+xAdxHIbBB1w6Dk9MXrD2y9lPDGNWEKNNIFzGl6Ac /wh3Jxq1dvnyg+xETS9BRVC2n2I2wZHlqR/EWyaL9ZLuAxXN06kNhVv21IcuEMlXSnacIU 9Rw5ShbCYiqvRA48TMDFQPDxqyINd8TztMg0WZ7bHJ0nc3dtn2hvn9x5hWwHJz/4qGwvWS fg4TPyR1LPuW06ihvXAZ1Fu1Xoh+YB0D/gMtXxWPUbUnn9ZF7i5+NcvlZES9jHWtMxIMSL ynnyoEkXfIkjOR0igDBHNd3zdjnrJEU87Uzd91sGOBhDOeAio0tzqdlQ/3h98Q== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1602605303; 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=Yk9/xsWpN+izJ6I1DpgXP2LR+S+kXFd4Rn6xEwt493Y=; b=l1MKNHo33W6F4SaNuHSZMsB1zJUn6LELKtkXHI+4adZo7hOePrLMnGmnxr3FIbsvgu/gDs 8njbdtZ9YQI7r6Ag== From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 23/54] samba: Drop interfaces configuration Date: Tue, 13 Oct 2020 16:07:41 +0000 Message-Id: <20201013160812.27754-23-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 virtually impossible to limit samba to these interfaces only. Therefore we add a static list of all interfaces of the local network. Signed-off-by: Michael Tremer --- html/cgi-bin/samba.cgi | 32 +------------------------------- 1 file changed, 1 insertion(+), 31 deletions(-) diff --git a/html/cgi-bin/samba.cgi b/html/cgi-bin/samba.cgi index 78efc5175..902ae6eac 100644 --- a/html/cgi-bin/samba.cgi +++ b/html/cgi-bin/samba.cgi @@ -184,7 +184,7 @@ guest account = $sambasettings{'GUESTACCOUNT'} unix password sync = $sambasettings{'PASSWORDSYNC'} bind interfaces only = true -interfaces = $sambasettings{'INTERFACES'} +interfaces = green0 blue0 127.0.0.0/8 remote announce = $sambasettings{'REMOTEANNOUNCE'} remote browse sync = $sambasettings{'REMOTESYNC'} @@ -336,37 +336,7 @@ print < $Lang::tr{'basic options'} $Lang::tr{'workgroup'} -$Lang::tr{'interfaces'}on / - off | - OpenVpn - $ovpnip[0].$ovpnip[1].$ovpnip[2].$ovpnip[3]/$ovpnnetwork[1] -on / - off | - $Lang::tr{'green'} - $netsettings{'GREEN_DEV'} -END -; - -if (&Header::blue_used()) - { - print <on / - off | - $Lang::tr{'wireless'} - $netsettings{'BLUE_DEV'} -END -; - } - -if (&Header::orange_used()) - { - print <on / - off | - $Lang::tr{'dmz'} - $netsettings{'ORANGE_DEV'} -END -; - } - print <$Lang::tr{'more'}
Wide linkson / off