From patchwork Tue Oct 20 14:58:54 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gert Doering X-Patchwork-Id: 5494 Return-Path: Delivered-To: patchwork@openvpn.net Received: by 2002:a05:7000:848c:b0:8dc:5c83:a4ec with SMTP id z12csp2797487max; Tue, 20 Oct 2026 07:59:44 -0700 (PDT) X-Forwarded-Encrypted: i=2; AKwUvByxVNXjiX8vD+6GStzyG3O5WRPW6veQRm7GkCLC+PfO8PrDvCXoaAzWGAbz0uWP9EPLgLRzF1uICME=@openvpn.net X-Received: by 2002:a05:7022:3c0d:b0:143:26eb:18e9 with SMTP id a92af1059eb24-185136caf1dmr14207629c88.28.1792508384605; Tue, 20 Oct 2026 07:59:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1792508384; cv=none; d=google.com; s=arc-20260327; b=gWS97YmTXSpO6XeKHlzk9jdiBDtPtPU4RyCZuVx5otaanXpW+fN4YU8h2XKrS89phg stxDEw6PdoVvD96tt7HdtVGV++dB1bGdYcYvj41u5/XMPeRN9kI0FAJOA+ntEc92Cv5N KuugHAF6gyjUT8UdQaKSby+NJgN4B5kAf/F6ORFi2p0V8U5kAlAd94OaOX+6gcCScgxM /nE6FshJAELZpTZKONLd3AYMg3fRyCoFFbl0CLnjkthWddete3WsZ7wPMWlULJywsN2k INVFypmEvVEjzZmPBgr4mz5tGxrdqpQRUC0IGpZLowbxSCpSZ3r4yLwyEhr3DDeR5uv6 LrzQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20260327; h=errors-to:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:references:in-reply-to:message-id:date:to:from :dkim-signature:dkim-signature:dkim-signature; bh=qmt0WIUz9HFNf2pBooKZj55lqoK1QOzYeWUhV7mJx6Y=; fh=4NbAC/LsuMLI0S0hprUlLSLCiHwg6SCAifhH718Jh0Q=; b=iBwDe+hUMkiqycnEjEm8gR5RZ5dHbOkVanA2MR3LworARyqbnSQKY9sSHQUvKmtv+/ xpvgEPIBt+PcvIp5gfUO08qY8+MORqTTZD8Ti/oMspCZH7xm5JoS8aEmy0dDPcwLUk4V tjJt6h6nlNEWq89zgl+wlopCrR6aC5tq0BEbrLHVeLn99PHBmjBagdPnaBkpk1RPKCIT TapGJ1j98peNALFEbe/dk3F++TW2IYA0ADAMrUBFlvB09IdF9X/9KP52qbx4qqoVs4lw 8ErEq++1Ww13EFlyYUBcPrsnIPXTP6EQ86rn8IhPboEtt3eCSiOPykgqM/xUvgivdpel sdzw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@lists.sourceforge.net header.s=beta header.b=F5ztzktm; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=b2VNSvgB; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=D6yhvfid; spf=pass (google.com: domain of openvpn-devel-bounces@lists.sourceforge.net designates 216.105.38.7 as permitted sender) smtp.mailfrom=openvpn-devel-bounces@lists.sourceforge.net; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=muc.de Received: from lists.sourceforge.net (lists.sourceforge.net. [216.105.38.7]) by mx.google.com with ESMTPS id a92af1059eb24-187aa891109si23489729c88.26.2026.10.20.07.59.42 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 20 Oct 2026 07:59:44 -0700 (PDT) Received-SPF: pass (google.com: domain of openvpn-devel-bounces@lists.sourceforge.net designates 216.105.38.7 as permitted sender) client-ip=216.105.38.7; Authentication-Results: mx.google.com; dkim=pass header.i=@lists.sourceforge.net header.s=beta header.b=F5ztzktm; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=b2VNSvgB; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=D6yhvfid; spf=pass (google.com: domain of openvpn-devel-bounces@lists.sourceforge.net designates 216.105.38.7 as permitted sender) smtp.mailfrom=openvpn-devel-bounces@lists.sourceforge.net; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=muc.de DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.sourceforge.net; s=beta; h=Content-Transfer-Encoding:Content-Type: List-Subscribe:List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id: Subject:MIME-Version:References:In-Reply-To:Message-ID:Date:To:From:Sender: Reply-To:Cc:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=qmt0WIUz9HFNf2pBooKZj55lqoK1QOzYeWUhV7mJx6Y=; b=F5ztzktmK0LPCKKSmDdiaSqsc6 ZyarWOBjWzdn7uv/OUhkm2l8/Wx7Tty39Wjvkx0pSiaQLOr44Ga4/jdhJta+L+NLej8bbaXu2mXCN ZrTqqbY3ww0XPjP+1xsIRkvX01qjvsf6PSYS+0MId98e8fmFdtbrQNUIyPHf3wR0sTnA=; 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.95) (envelope-from ) id 1xJBJ1-0007Hp-9F; Tue, 20 Oct 2026 14:59:08 +0000 Received: from [172.30.29.66] (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.95) (envelope-from ) id 1xJBJ0-0007Hi-2t for openvpn-devel@lists.sourceforge.net; Tue, 20 Oct 2026 14:59:07 +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:References: In-Reply-To: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:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=yHYsepMw0I9nc1aF9TeZvx0kgxGP35rHzBYiK+sRwak=; b=b2VNSvgBqZgzuJtZmdd8HUHm/V v1CoN4aQOFir6OC6u9nH6x4AN9qlcXkTpvLo2EdsuK9w2wo8IyafvslikkXLAHITBjex72cJ3rUax DmoxQyHjbkR7+RyAqVJtm6ruaC7veL9yXARlL2hF1Gbiz5cZKfAL67DbOVDCRccI7Cr8=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To: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:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=yHYsepMw0I9nc1aF9TeZvx0kgxGP35rHzBYiK+sRwak=; b=D6yhvfidWzDU6aDBCh3pL87Hsm sy4MfR9KLRPvHToqAavdAci+tzfBMOHY6f2XEmTCfcMNrqUaauITSx9mdTx1yzFo/Ea8LNWY/JPQ8 qiQNdzvn6TMiqwsQp6erp/aSMCApSU6vkwNKxIm7CzlxtWsQXLUg8itqdMjgQuc13opg=; Received: from [193.149.48.129] (helo=blue.greenie.muc.de) by sfi-mx-2.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.95) id 1xJBIw-0007Wr-Lx for openvpn-devel@lists.sourceforge.net; Tue, 20 Oct 2026 14:59:07 +0000 Received: from blue.greenie.muc.de (localhost [127.0.0.1]) by blue.greenie.muc.de (8.18.1/8.18.1) with ESMTP id 69KEwxix001470 for ; Tue, 20 Oct 2026 16:58:59 +0200 Received: (from gert@localhost) by blue.greenie.muc.de (8.18.2/8.18.1/Submit) id 69KEwxsr001469 for openvpn-devel@lists.sourceforge.net; Tue, 20 Oct 2026 16:58:59 +0200 From: Gert Doering To: openvpn-devel@lists.sourceforge.net Date: Tue, 20 Oct 2026 16:58:54 +0200 Message-ID: <20261020145859.1457-1-gert@greenie.muc.de> X-Mailer: git-send-email 2.55.0 In-Reply-To: References: MIME-Version: 1.0 X-Spam-Score: 1.3 (+) X-Spam-Report: Spam detection software, running on the system "sfi-spamd-2.hosts.colo.sdot.me", 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: Said commit only cherry-picked the "actual code change" but not the required adjustments for the unit tests, leading to an unresolved symbol. Master has all the mock functions in mock_push_dependencies.c which does not exist in release/2.7, so import "uninit_options()" into the actual unit test source (as are all the other mocked functions [...] Content analysis details: (1.3 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 URIBL_BLOCKED ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [URI: openvpn.net] 1.3 RDNS_NONE Delivered to internal network by a host with no rDNS X-Headers-End: 1xJBIw-0007Wr-Lx Subject: [Openvpn-devel] [PATCH v1] Fix broken unit tests after commit 5c6fbd0a11 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 X-GMAIL-THRID: 1879581271623493611 X-GMAIL-MSGID: 1879581271623493611 Said commit only cherry-picked the "actual code change" but not the required adjustments for the unit tests, leading to an unresolved symbol. Master has all the mock functions in mock_push_dependencies.c which does not exist in release/2.7, so import "uninit_options()" into the actual unit test source (as are all the other mocked functions in 2.7) Change-Id: I7f2db60564fa179ce5f56979912c7e484dad1e1d Signed-off-by: Gert Doering Acked-by: Razvan Cojocaru Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/2023 --- This change was reviewed on Gerrit and approved by at least one developer. I request to merge it to release/2.7. Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/2023 This mail reflects revision 1 of this Change. Acked-by according to Gerrit (reflected above): Razvan Cojocaru diff --git a/tests/unit_tests/openvpn/test_push_update_msg.c b/tests/unit_tests/openvpn/test_push_update_msg.c index 9b7978e..75b654b 100644 --- a/tests/unit_tests/openvpn/test_push_update_msg.c +++ b/tests/unit_tests/openvpn/test_push_update_msg.c @@ -48,6 +48,13 @@ return; } +void +uninit_options(struct options *options) +{ + gc_free(&options->gc); + gc_free(&options->dns_options.gc); +} + bool options_postprocess_pull(struct options *options, struct env_set *es) {