From patchwork Mon May 30 12:41:49 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arne Schwabe X-Patchwork-Id: 2501 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director7.mail.ord1d.rsapps.net ([172.27.255.53]) by backend41.mail.ord1d.rsapps.net with LMTP id GPUPBn5IlWJ4CgAAqwncew (envelope-from ) for ; Mon, 30 May 2022 18:43:10 -0400 Received: from proxy16.mail.iad3a.rsapps.net ([172.27.255.53]) by director7.mail.ord1d.rsapps.net with LMTP id yPJiFH5IlWLNYgAAovjBpQ (envelope-from ) for ; Mon, 30 May 2022 18:43:10 -0400 Received: from smtp32.gate.iad3a ([172.27.255.53]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy16.mail.iad3a.rsapps.net with LMTPS id wLtPDH5IlWLGIQAADc5QwQ (envelope-from ) for ; Mon, 30 May 2022 18:43:10 -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: smtp32.gate.iad3a.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: e0e542f0-e069-11ec-a059-5254001741cc-1-1 Received: from [216.105.38.7] ([216.105.38.7:57300] helo=lists.sourceforge.net) by smtp32.gate.iad3a.rsapps.net (envelope-from ) (ecelerity 4.2.38.62370 r(:)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id ED/C0-19692-D7845926; Mon, 30 May 2022 18:43:09 -0400 Received: from [127.0.0.1] (helo=sfs-ml-1.v29.lw.sourceforge.com) by sfs-ml-1.v29.lw.sourceforge.com with esmtp (Exim 4.94.2) (envelope-from ) id 1nvo5L-00008E-5P; Mon, 30 May 2022 22:42:03 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-1.v29.lw.sourceforge.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1nvo5K-000085-Ke for openvpn-devel@lists.sourceforge.net; Mon, 30 May 2022 22:42:03 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=Content-Transfer-Encoding:MIME-Version:Message-Id: Date:Subject:To:From:Sender:Reply-To:Cc:Content-Type: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=PydNpGp/j1bwdgtkH2bMSwtmxOz1zSatiS5pUDnX1Ms=; b=hEc3n4uzvvZq/O8ZY5WlhEOoTl LkBpq5s1zclx4ill1QlfsieFE2reQapufgJy3cKcb4qhIuGrE4iGyJqvZAOJshWQIDKl9K4quqPdB BocrF6yNQOjhtZUYfoaDgZai9PAUyiCSP74lBy4vTEQVD8CNFk7yH0u6SXJAVjDwb1Ls=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Content-Transfer-Encoding:MIME-Version:Message-Id:Date:Subject:To:From: Sender:Reply-To:Cc:Content-Type: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=PydNpGp/j1bwdgtkH2bMSwtmxOz1zSatiS5pUDnX1Ms=; b=j FLqAaJ1EoAAOTIuVLY1R10zkhwgQ5Dwv7hMIGeXLzUDYKMqhteRRJ8SzJVEHJE2BIKBUT2M56e9Bd t3Bnvebkx2R+AwJDCCtMpfGPi/MkYeZC2WpvfAXlctiWX8g9/K9tD9wqYWDqbn8e4BGR65O0sQPih 7BmdzwyEW1BItVIQ=; Received: from mail.blinkt.de ([192.26.174.232]) by sfi-mx-1.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.94.2) id 1nvo5J-0062TI-UM for openvpn-devel@lists.sourceforge.net; Mon, 30 May 2022 22:42:02 +0000 Received: from kamera.blinkt.de ([2001:638:502:390:20c:29ff:fec8:535c]) by mail.blinkt.de with smtp (Exim 4.95 (FreeBSD)) (envelope-from ) id 1nvo58-000Kgp-0o for openvpn-devel@lists.sourceforge.net; Tue, 31 May 2022 00:41:50 +0200 Received: (nullmailer pid 201930 invoked by uid 10006); Mon, 30 May 2022 22:41:49 -0000 From: Arne Schwabe To: openvpn-devel@lists.sourceforge.net Date: Tue, 31 May 2022 00:41:49 +0200 Message-Id: <20220530224149.201883-1-arne@rfc2549.org> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-Spam-Report: Spam detection software, running on the system "util-spamd-1.v13.lw.sourceforge.com", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: The out buffer is not filled and this adds an extra empty line for CR_RESPONSE outputs. Also make minor style fixes. Signed-off-by: Arne Schwabe --- src/openvpn/manage.c | 5 +---- src/openvpn/push.c | 1 - 2 files changed, 1 insertion(+), 5 deletions(-) Content analysis details: (0.3 points, 6.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.2 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 X-Headers-End: 1nvo5J-0062TI-UM Subject: [Openvpn-devel] [PATCH] Remove useless empty line from CR_RESPONSE message 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: , Errors-To: openvpn-devel-bounces@lists.sourceforge.net X-getmail-retrieved-from-mailbox: Inbox The out buffer is not filled and this adds an extra empty line for CR_RESPONSE outputs. Also make minor style fixes. Signed-off-by: Arne Schwabe Acked-by: Gert Doering --- src/openvpn/manage.c | 5 +---- src/openvpn/push.c | 1 - 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/src/openvpn/manage.c b/src/openvpn/manage.c index 9c07bf298..edcf0f202 100644 --- a/src/openvpn/manage.c +++ b/src/openvpn/manage.c @@ -2883,17 +2883,14 @@ management_notify_client_cr_response(unsigned mda_key_id, { gc = gc_new(); - struct buffer out = alloc_buf_gc(256, &gc); msg(M_CLIENT, ">CLIENT:CR_RESPONSE,%lu,%u,%s", mdac->cid, mda_key_id, response); man_output_extra_env(management, "CLIENT"); - if (management->connection.env_filter_level>0) + if (management->connection.env_filter_level > 0) { man_output_peer_info_env(management, mdac); } man_output_env(es, true, management->connection.env_filter_level, "CLIENT"); - management_notify_generic(management, BSTR(&out)); - gc_free(&gc); } } diff --git a/src/openvpn/push.c b/src/openvpn/push.c index 7cf882d11..2332bc464 100644 --- a/src/openvpn/push.c +++ b/src/openvpn/push.c @@ -249,7 +249,6 @@ receive_cr_response(struct context *c, const struct buffer *buffer) struct env_set *es = session->opt->es; int key_id = get_primary_key(c->c2.tls_multi)->key_id; - management_notify_client_cr_response(key_id, mda, es, m); #endif #if ENABLE_PLUGIN