From patchwork Mon Jul 10 11:21:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lev Stipakov X-Patchwork-Id: 3280 Return-Path: Delivered-To: patchwork@openvpn.net Received: by 2002:a05:7300:1496:b0:d7:3b0f:3938 with SMTP id b22csp2902967dyh; Mon, 10 Jul 2023 04:22:29 -0700 (PDT) X-Google-Smtp-Source: APBJJlGWBrm/KF/tP2XQewqjLf2Z27Z5r1AyhrrcErXrDHCnbhDhBTNlYrWkhl2LPOI030axSOI4 X-Received: by 2002:a17:902:e852:b0:1b9:ea60:cd91 with SMTP id t18-20020a170902e85200b001b9ea60cd91mr177718plg.7.1688988149558; Mon, 10 Jul 2023 04:22:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688988149; cv=none; d=google.com; s=arc-20160816; b=T5Hj8Q6DbdQngeKYmy5cpLNuf0djsdCgyb3XzBX96WDSsZh/8bJCdvwpqZtORJwatr EIow/oNGZbVh6sLhu6RLDpmOxBMonZVwYwPxyJNFajMdQmzH6ahxpR/j/lOqFTFP2hl3 cnojv1FfM3zu2pmuBztrMpzBO4ii9OOs6KdkgsY3IVoPsksBwfvWbXJsppGfLPOhiWpD KbPnpuRnv9ATMcSYwstH77nnEh5q4xrywD4sRWO/X6Q9ryRPxkmBpv8MUKKckRUivA1O bGsQWqqshM1y3oeWjtlfADqMm4Bkhr2eOqRNClPGwKzdF045R7ekZsj83nAx2RvDRlGD e+9Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:content-transfer-encoding:cc:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:message-id:date:to:from:dkim-signature:dkim-signature :dkim-signature; bh=G1luiXLRhkw1utMZCVaq+etdbm8/TtygPQLoa7Tqz50=; fh=o9LvTEhp9Htq5/McLoxX/vV+8wLprJRMAMA6oYFIWDY=; b=rCPc5p5HqWiRSxFhIPMNz5h+RK6JsTPZjf5u/J1L2v7Xrpst5zJrkSpiW6LiuDTK33 bc+syBfzBmOnnN0PGokRMvfqTbXCF79DqZZiaOIhXYl1WwsN1AubjasIQpb46qC+AVNr dydIUd1Tx3LxPprgt+e3/wPKlGDw53cIwYwDcGJyaJFaV8lZtOiXCmsvFpbavlCRJWDR yBhG5ZIxuHKyhGgNAAhjvcrAch7X+WlDLH+zqNG/bwmK1qjkM9K72K7zJP1kjmpJ8zuj fb2JU2oOssStbH0P9alWw9PtyyKyc+8MJaao9Lr2Xka4yeM3woM/HhuHKSG4syrMHZ6E F/DQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=eEflEhWB; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=ZFpG1CqZ; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b=QaArQlxE; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: from lists.sourceforge.net (lists.sourceforge.net. [216.105.38.7]) by mx.google.com with ESMTPS id lb3-20020a170902fa4300b001b8b32c5e38si8012356plb.263.2023.07.10.04.22.29 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 10 Jul 2023 04:22:29 -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=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=eEflEhWB; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=ZFpG1CqZ; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b=QaArQlxE; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.0.1] (helo=sfs-ml-4.v29.lw.sourceforge.com) by sfs-ml-4.v29.lw.sourceforge.com with esmtp (Exim 4.95) (envelope-from ) id 1qIoxr-0000bT-9V; Mon, 10 Jul 2023 11:22:00 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-4.v29.lw.sourceforge.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1qIoxj-0000bI-4S for openvpn-devel@lists.sourceforge.net; Mon, 10 Jul 2023 11:21:52 +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:Cc:To:From:Sender:Reply-To: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=xXQ2Eecd2xoGRa/e06k5FKO5O9GcqXmkbCQizizJ7Us=; b=eEflEhWBK19NpZAuiDNf4Alszt j7BsirF6RQJqRwStAShImb4L4EN/7atALWpvbuloqT0N0kbY8Lkl+aizA0CfvvrF2YoArebZ/WdJI O0aSBUkztdt+r8cGwettCxjUHhUneEhBdS1ZjqqueFf3jd9jN6+UCK51pfoJm+Rn5TDg=; 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:Cc:To:From :Sender:Reply-To: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=xXQ2Eecd2xoGRa/e06k5FKO5O9GcqXmkbCQizizJ7Us=; b=Z FpG1CqZjP8ew89BQvcwflK5HDpH8EMx6khYAnNAyGfS1DIJL00zQifvkWetT8BUIE2j0jYNq6yNrO n1onhKLRWx0+qoYbs9BQLJFdok2/MF3yqt7oMZlHpPBhObpHmnFT0Tmr39D6PWirotfJzv8v3TcsP PhkJKYXqdMIXsHT8=; Received: from mail-lf1-f47.google.com ([209.85.167.47]) by sfi-mx-2.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.95) id 1qIoxf-0000OG-4C for openvpn-devel@lists.sourceforge.net; Mon, 10 Jul 2023 11:21:48 +0000 Received: by mail-lf1-f47.google.com with SMTP id 2adb3069b0e04-4fafe87c6fbso6642100e87.3 for ; Mon, 10 Jul 2023 04:21:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1688988098; x=1691580098; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=xXQ2Eecd2xoGRa/e06k5FKO5O9GcqXmkbCQizizJ7Us=; b=QaArQlxE7myCxPrGTNDsam7niCMEoriFFK3RRuOs5PK6Bgi9gXuAX96k0MmVP9E83X F7DiWOhwZSwvZFeVzwbgfwMgIR/U+V8sklsvqpP27RigmgxUaBa1ODMVq+OkLSX+aJo0 9AWGvi2vp5an0fQ02GJyW98aNuUogN7mLWqHAjEZhANcoE3fGgA6kQ/RdRjwex8zq/oX nAwf9KZm3ZaYWQEnUVqPd2bzPLtqmS8TqmfnYnqdAy/iIsBN3pMDoEBIpxeT7NR6HozQ B5AYQ8g1DLdbBeCkO6+u1FF4s8ouCA+B1W1gQfqjEcQhupAbpqb7AGreih396U1mUNpt st6w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688988098; x=1691580098; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=xXQ2Eecd2xoGRa/e06k5FKO5O9GcqXmkbCQizizJ7Us=; b=TqIQFDtvDPhmPuOAuxXYeXorr9sFY/gF4F28jHXYm9huS0Z1T7MKmkjQ7tme6nA3MN nDC6+350nAcHEMIT9l9YrBsLbnOp/HByJg2++JHyvFIQTS09YpoDGIbulAtY31O1gpQE 3FgJAPJJ3aJK+oHUkouoDSh5OI8IaTGd9aJByH05JVC4ZEzMJczIBcjmD3cWqmkidr/X 58j7YHsI8F1WGT0tgYiwXmivQYoA+CuwLq2IawFQsg6Y8VgI95ltGQ8E4YlXOz/DnOQY f9KKbjugacmcFgUviGXIFmbIwnUIbIdSnsXR6AfU3bQ7LqFNHcGBiEpJ9b59l3FDkuTa OICw== X-Gm-Message-State: ABy/qLbHz/ty1qlBnAVj7twz1MnilKrtjSFJP4Foa2mo0OGsMvlIav7L i0VdhqNUZ5psKLM4zkZ2MLF1EHyZUmk= X-Received: by 2002:a05:6512:1310:b0:4fb:8bea:f5f7 with SMTP id x16-20020a056512131000b004fb8beaf5f7mr10394513lfu.11.1688988097697; Mon, 10 Jul 2023 04:21:37 -0700 (PDT) Received: from localhost.localdomain ([2a00:1d50:3:0:5858:aa35:6c18:8a12]) by smtp.gmail.com with ESMTPSA id j2-20020ac25502000000b004fba6d3eb82sm1645134lfk.48.2023.07.10.04.21.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Jul 2023 04:21:36 -0700 (PDT) From: Lev Stipakov To: openvpn-devel@lists.sourceforge.net Date: Mon, 10 Jul 2023 14:21:22 +0300 Message-Id: <20230710112122.576-1-lstipakov@gmail.com> X-Mailer: git-send-email 2.38.1.windows.1 MIME-Version: 1.0 X-Spam-Score: -0.2 (/) X-Spam-Report: Spam detection software, running on the system "util-spamd-2.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: From: Lev Stipakov This is needed to support domains with hyphens. Not using double quotes here, since our code replaces them with underbars (see https://github.com/OpenVPN/openvpn/blob/master/src/openvpn/win32.c#L980). Content analysis details: (-0.2 points, 6.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [lstipakov[at]gmail.com] 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.85.167.47 listed in wl.mailspike.net] -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.167.47 listed in list.dnswl.org] -0.0 T_SCC_BODY_TEXT_LINE No description available. X-Headers-End: 1qIoxf-0000OG-4C Subject: [Openvpn-devel] [PATCH] tun.c: enclose DNS domain in single quotes in WMIC call 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: , Cc: Lev Stipakov Errors-To: openvpn-devel-bounces@lists.sourceforge.net X-getmail-retrieved-from-mailbox: Inbox X-GMAIL-THRID: =?utf-8?q?1771032437795611252?= X-GMAIL-MSGID: =?utf-8?q?1771032437795611252?= From: Lev Stipakov This is needed to support domains with hyphens. Not using double quotes here, since our code replaces them with underbars (see https://github.com/OpenVPN/openvpn/blob/master/src/openvpn/win32.c#L980). Fixes https://github.com/OpenVPN/openvpn/issues/363 Change-Id: Iab536922d0731635cef529b5caf542f637b8d491 Signed-off-by: Lev Stipakov Acked-by: Selva Nair --- src/openvpn/tun.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/openvpn/tun.c b/src/openvpn/tun.c index d1fd6def..60974208 100644 --- a/src/openvpn/tun.c +++ b/src/openvpn/tun.c @@ -333,7 +333,7 @@ do_dns_domain_wmic(bool add, const struct tuntap *tt) } struct argv argv = argv_new(); - argv_printf(&argv, "%s%s nicconfig where (InterfaceIndex=%ld) call SetDNSDomain %s", + argv_printf(&argv, "%s%s nicconfig where (InterfaceIndex=%ld) call SetDNSDomain '%s'", get_win_sys_path(), WMIC_PATH_SUFFIX, tt->adapter_index, add ? tt->options.domain : ""); exec_command("WMIC", &argv, 1, M_WARN);