From patchwork Wed Jul 1 02:22:39 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arne Schwabe X-Patchwork-Id: 1194 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director8.mail.ord1d.rsapps.net ([172.31.255.6]) by backend30.mail.ord1d.rsapps.net with LMTP id kNihHVWA/F73DAAAIUCqbw for ; Wed, 01 Jul 2020 08:23:49 -0400 Received: from proxy7.mail.iad3b.rsapps.net ([172.31.255.6]) by director8.mail.ord1d.rsapps.net with LMTP id ULZvG1WA/F4zUgAAfY0hYg ; Wed, 01 Jul 2020 08:23:49 -0400 Received: from smtp22.gate.iad3b ([172.31.255.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy7.mail.iad3b.rsapps.net with LMTP id iCVzFlWA/F4uRwAAQkQ5tQ ; Wed, 01 Jul 2020 08:23:49 -0400 X-Spam-Threshold: 95 X-Spam-Score: 0 X-Spam-Flag: NO X-Virus-Scanned: OK X-Orig-To: openvpnslackdevel@openvpn.net X-Originating-Ip: [216.105.38.7] Authentication-Results: smtp22.gate.iad3b.rsapps.net; iprev=pass policy.iprev="216.105.38.7"; spf=pass smtp.mailfrom="openvpn-devel-bounces@lists.sourceforge.net" smtp.helo="lists.sourceforge.net"; dkim=fail (signature verification failed) header.d=sourceforge.net; dkim=fail (signature verification failed) header.d=sf.net; dmarc=none (p=nil; dis=none) header.from=rfc2549.org X-Suspicious-Flag: YES X-Classification-ID: b6be0e08-bb95-11ea-b209-52540041dff8-1-1 Received: from [216.105.38.7] ([216.105.38.7:50136] helo=lists.sourceforge.net) by smtp22.gate.iad3b.rsapps.net (envelope-from ) (ecelerity 4.2.38.62370 r(:)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id 92/99-02446-4508CFE5; Wed, 01 Jul 2020 08:23:48 -0400 Received: from [127.0.0.1] (helo=sfs-ml-2.v29.lw.sourceforge.com) by sfs-ml-2.v29.lw.sourceforge.com with esmtp (Exim 4.90_1) (envelope-from ) id 1jqblQ-0002FT-U1; Wed, 01 Jul 2020 12:22:56 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-2.v29.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jqblP-0002FH-6P for openvpn-devel@lists.sourceforge.net; Wed, 01 Jul 2020 12:22:55 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=Message-Id:Date:Subject:To:From:Sender:Reply-To:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=Yy1GnTGAXVvV/ViNDGfqxajBZv9/6eZqXiX0qnsX87U=; b=HdSC3Pkn1JIcyWGEO88HgCueZs p3smguTrTqxa4VzF8u8UW564R1qh226nkq8uSdlYEjv2yjYysh2EigzbDqN8AUI0hcDDM792XSC8i OkbRz6wDILsuEhf++XHRmf5KlxMfcsiJkd+bLXjo97hcVkVkYr9pYqC2dMHOwxtwv7BM=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Message-Id:Date:Subject:To:From:Sender:Reply-To:Cc:MIME-Version: Content-Type:Content-Transfer-Encoding:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=Yy1GnTGAXVvV/ViNDGfqxajBZv9/6eZqXiX0qnsX87U=; b=H1BpXd1ASTrkvrIvWQRLcCjAwX w0HmrQMsYYY56c/rjqy0/zAquB+3Gfozoj5C+J9PGRHRI9Z0P4KCzbJpmQfne7zJXlZAv15zm2X5e FXCBhTllfPaGoQahRk4weR+ertufbq7DlRx/e4juGMO4c2jclP2qvk8nk5QgWH9pvOJk=; Received: from mail.blinkt.de ([192.26.174.232]) by sfi-mx-1.v28.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.92.2) id 1jqblL-008diI-HW for openvpn-devel@lists.sourceforge.net; Wed, 01 Jul 2020 12:22:55 +0000 Received: from kamera.blinkt.de ([2001:638:502:390:20c:29ff:fec8:535c]) by mail.blinkt.de with smtp (Exim 4.92.3 (FreeBSD)) (envelope-from ) id 1jqbl9-0000s7-Mb for openvpn-devel@lists.sourceforge.net; Wed, 01 Jul 2020 14:22:39 +0200 Received: (nullmailer pid 6971 invoked by uid 10006); Wed, 01 Jul 2020 12:22:39 -0000 From: Arne Schwabe To: openvpn-devel@lists.sourceforge.net Date: Wed, 1 Jul 2020 14:22:39 +0200 Message-Id: <20200701122239.6924-1-arne@rfc2549.org> X-Mailer: git-send-email 2.17.1 X-Spam-Report: Spam Filtering performed by mx.sourceforge.net. See http://spamassassin.org/tag/ for more details. 0.0 URIBL_BLOCKED ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [URIs: rfc2549.org] 0.0 HEADER_FROM_DIFFERENT_DOMAINS From and EnvelopeFrom 2nd level mail domains are different 0.0 SPF_NONE SPF: sender does not publish an SPF Record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record X-Headers-End: 1jqblL-008diI-HW Subject: [Openvpn-devel] [PATCH] Remove parameter config from multi_client_connect_mda X-BeenThere: openvpn-devel@lists.sourceforge.net X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: openvpn-devel-bounces@lists.sourceforge.net X-getmail-retrieved-from-mailbox: Inbox config is always used as mi->cc_config and we pass mi, so directly use mi->cc_config Signed-off-by: Arne Schwabe Acked-by: Antonio Quartulli --- src/openvpn/multi.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/openvpn/multi.c b/src/openvpn/multi.c index 95b16744..19261c37 100644 --- a/src/openvpn/multi.c +++ b/src/openvpn/multi.c @@ -1722,11 +1722,10 @@ multi_client_connect_post_plugin(struct multi_context *m, static void multi_client_connect_mda(struct multi_context *m, struct multi_instance *mi, - const struct buffer_list *config, unsigned int option_permissions_mask, unsigned int *option_types_found) { - if (config) + if (mi->cc_config) { struct buffer_entry *be; @@ -1986,7 +1985,7 @@ script_failed: #ifdef MANAGEMENT_DEF_AUTH if (cc_succeeded && mi->cc_config) { - multi_client_connect_mda(m, mi, mi->cc_config, option_permissions_mask, &option_types_found); + multi_client_connect_mda(m, mi, option_permissions_mask, &option_types_found); ++cc_succeeded_count; } #endif