From patchwork Sat Apr 3 01:24:44 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arne Schwabe X-Patchwork-Id: 1705 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director11.mail.ord1d.rsapps.net ([172.27.255.56]) by backend30.mail.ord1d.rsapps.net with LMTP id oD8tDOFeaGC8YQAAIUCqbw (envelope-from ) for ; Sat, 03 Apr 2021 08:26:09 -0400 Received: from proxy2.mail.iad3a.rsapps.net ([172.27.255.56]) by director11.mail.ord1d.rsapps.net with LMTP id uFX/C+FeaGB+awAAvGGmqA (envelope-from ) for ; Sat, 03 Apr 2021 08:26:09 -0400 Received: from smtp32.gate.iad3a ([172.27.255.56]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy2.mail.iad3a.rsapps.net with LMTPS id QMVtBeFeaGD7BQAABcWvHw (envelope-from ) for ; Sat, 03 Apr 2021 08:26:09 -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: c43e8e20-9477-11eb-96f0-5254001741cc-1-1 Received: from [216.105.38.7] ([216.105.38.7:60866] 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 C6/71-22243-0EE58606; Sat, 03 Apr 2021 08:26:08 -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.90_1) (envelope-from ) id 1lSfL2-0002jg-Mt; Sat, 03 Apr 2021 12:25:16 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-1.v29.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lSfKz-0002iV-0W for openvpn-devel@lists.sourceforge.net; Sat, 03 Apr 2021 12:25:13 +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=6KONXZYQx+htIcVl5xOdl2+cFk3hCHSVpZhgRJ+I9wI=; b=BhwTEzybzdimTreUiBbAglmxYm OC3gan+ZlUKJ6NU8PfoB4J9hemfwICCI/FqGfauzOINRoWpOvQRQ9B83cTDGQKUW48eyeOXNdfya0 pRQPcnwkDfL7ulK/XhDQOywfz7+wjTUZJkTU9VV53whe2/+8NZtc6jYEOFDgn45ggqio=; 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=6KONXZYQx+htIcVl5xOdl2+cFk3hCHSVpZhgRJ+I9wI=; b=g8+j/30uhY1RF5B7feeIGUAGWU KieFtowlB2qz33/EJUPla204aTqAdvJDNimDWoW0GHZuTi41XXSx0mdIt5WMBde6cSUhk+mNE75zS nZeAp81Z5JNK/5jsNuvql6G2pJ0MRY5CaYeZSGTU6DchJtC+VUfBNPN4J3K8hFoOO2RM=; 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 1lSfKf-00BFn6-Uz for openvpn-devel@lists.sourceforge.net; Sat, 03 Apr 2021 12:25:10 +0000 Received: from kamera.blinkt.de ([2001:638:502:390:20c:29ff:fec8:535c]) by mail.blinkt.de with smtp (Exim 4.94 (FreeBSD)) (envelope-from ) id 1lSfKW-000Duz-Pg for openvpn-devel@lists.sourceforge.net; Sat, 03 Apr 2021 14:24:44 +0200 Received: (nullmailer pid 17135 invoked by uid 10006); Sat, 03 Apr 2021 12:24:44 -0000 From: Arne Schwabe To: openvpn-devel@lists.sourceforge.net Date: Sat, 3 Apr 2021 14:24:44 +0200 Message-Id: <20210403122444.17090-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.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 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 TIME_LIMIT_EXCEEDED Exceeded time limit / deadline X-Headers-End: 1lSfKf-00BFn6-Uz Subject: [Openvpn-devel] [PATCH] Fix async push broken after auth deferred refactor 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 Commit c5fec838e moved the auth control file related states into its own struct. Unfortunately I forgot to also do the part inside #if defined(ENABLE_ASYNC_PUSH) Signed-off-by: Arne Schwabe Acked-by: Gert Doering --- src/openvpn/multi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/openvpn/multi.c b/src/openvpn/multi.c index 72f66c5bb..7c9500f3e 100644 --- a/src/openvpn/multi.c +++ b/src/openvpn/multi.c @@ -2984,11 +2984,11 @@ multi_process_post(struct multi_context *m, struct multi_instance *mi, const uns * and an auth_control_file, we assume it got just added and add * inotify watch to that file */ - if (ks && ks->auth_control_file && was_unauthenticated + if (ks && ks->plugin_auth.auth_control_file && was_unauthenticated && (ks->authenticated == KS_AUTH_DEFERRED)) { add_inotify_file_watch(m, mi, m->top.c2.inotify_fd, - ks->auth_control_file); + ks->plugin_auth.auth_control_file); } #endif