From patchwork Mon Nov 4 14:52:26 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: ummeegge X-Patchwork-Id: 2567 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) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 476G470WWMz43TZ for ; Mon, 4 Nov 2019 14:52:39 +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) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail02.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 476G453Wk4z2ft; Mon, 4 Nov 2019 14:52:37 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 476G451MQdz2yhr; Mon, 4 Nov 2019 14:52:37 +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) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 476G426g1wz2y0t for ; Mon, 4 Nov 2019 14:52:34 +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 476G421dhnz2Md; Mon, 4 Nov 2019 14:52:33 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=201909ed25519; t=1572879154; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc; bh=4jfn9UpsyLWitm2ekyqSitD3VA6EvRMSC2L1nXO5ICQ=; b=/aMxU/NbKB4c+okPkG+e2Qy14fx6rI3562dQInpHYczRPP7xfYvbKmaRhnXb/X7ZldFyS0 kSlV/nQrokaEI1Dw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=201909rsa; t=1572879154; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc; bh=4jfn9UpsyLWitm2ekyqSitD3VA6EvRMSC2L1nXO5ICQ=; b=cAMIdUEgTclOabDqBUHn0H8naBGvp5dBcx2V7jWaSJzq395Enwv0qoMdPVODTJOyhREEmy nKUSUI4E6Go4HIvKCViQAX7Cgf/asqIevWKLgC6dvxEgwMx3If/O1Oofnbh6eoQ8XnIcHj 2dG7BF6ifOt/9zCMXjGtwbFmiRe5tZCLVWVe+3nLhbWLoNbzonDvTATziyrc0Su/olCmUx HXjHkjXyBtqHN8x9qE8IcmkS6hjBLjIvlvwgtKs3B/JvXpK/V4kW/EB2rKWC4XnMgbb6He vZh1EfqOQ3qS52Hl3+sdG77hKfU6mtlcrWtpvrl2IeXF0drL6DFrgxUu/tVRDA== From: Erik Kapfer To: development@lists.ipfire.org Subject: [PATCH] OpenVPN: Fix max-clients option Date: Mon, 4 Nov 2019 15:52:26 +0100 Message-Id: <20191104145226.19638-1-ummeegge@ipfire.org> Authentication-Results: mail01.ipfire.org; auth=pass smtp.auth=ummeegge smtp.mailfrom=ummeegge@ipfire.org 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: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" Fix: Triggered by https://forum.ipfire.org/viewtopic.php?f=16&t=23551 Since the 'DHCP_WINS' cgiparam has been set for the max-client directive, changes in the WUI has not been adapted to server.conf. Signed-off-by: Erik Kapfer Reviewed-by: Michael Tremer --- html/cgi-bin/ovpnmain.cgi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi index 970444a55..09f0dc42f 100644 --- a/html/cgi-bin/ovpnmain.cgi +++ b/html/cgi-bin/ovpnmain.cgi @@ -355,10 +355,10 @@ sub writeserverconf { print CONF "push \"dhcp-option WINS $sovpnsettings{DHCP_WINS}\"\n"; } - if ($sovpnsettings{DHCP_WINS} eq '') { + if ($sovpnsettings{MAX_CLIENTS} eq '') { print CONF "max-clients 100\n"; } - if ($sovpnsettings{DHCP_WINS} ne '') { + if ($sovpnsettings{MAX_CLIENTS} ne '') { print CONF "max-clients $sovpnsettings{MAX_CLIENTS}\n"; } print CONF "tls-verify /usr/lib/openvpn/verify\n";