diff mbox series

[Openvpn-devel,v5] win: remove checks for PATHCCH_ENSURE_TRAILING_SLASH

Message ID 20251112092216.22703-1-gert@greenie.muc.de
State New
Headers show
Series [Openvpn-devel,v5] win: remove checks for PATHCCH_ENSURE_TRAILING_SLASH | expand

Commit Message

Gert Doering Nov. 12, 2025, 9:22 a.m. UTC 
From: Heiko Hund <heiko@ist.eigentlich.net>

Since the define is no longer used, remove configuration-time checks if
it exists, and also code dealing with situations where it doesn't.

Change-Id: I50f189048ef1a624e6ac84b71d7b22fcbbc3ab6b
Signed-off-by: Heiko Hund <heiko@ist.eigentlich.net>
Acked-by: Lev Stipakov <lstipakov@gmail.com>
Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1354
---

This change was reviewed on Gerrit and approved by at least one
developer. I request to merge it to master.

Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1354
This mail reflects revision 5 of this Change.

Acked-by according to Gerrit (reflected above):
Lev Stipakov <lstipakov@gmail.com>

Comments

Gert Doering Nov. 12, 2025, 10:37 a.m. UTC | #1 
Yeah, that looks a bit silly in retrospective... adding it for Cmake,
fixing it for autoconf, and then ripping it out again... but in the end,
the code is nicer this way, and we all learn on the journey ;-)

Sanity compiled on ubuntu 24.04 / mingw.

Your patch has been applied to the master branch.

commit 763160a16a8910d039cdb2359b10ec61b8041e4b
Author: Heiko Hund
Date:   Wed Nov 12 10:22:10 2025 +0100

     win: remove checks for PATHCCH_ENSURE_TRAILING_SLASH

     Signed-off-by: Heiko Hund <heiko@ist.eigentlich.net>
     Acked-by: Lev Stipakov <lstipakov@gmail.com>
     Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1354
     Message-Id: <20251112092216.22703-1-gert@greenie.muc.de>
     URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg34335.html
     Signed-off-by: Gert Doering <gert@greenie.muc.de>


--
kind regards,

Gert Doering
diff mbox series

Patch

diff --git a/configure.ac b/configure.ac
index 3117e13..8f3c01d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1383,17 +1383,6 @@ 
 	fi
 fi
 
-if test "${WIN32}" == "yes"; then
-	AC_CHECK_DECLS(
-		[PATHCCH_ENSURE_TRAILING_SLASH],
-		[AC_DEFINE([HAVE_PATHCCH_ENSURE_TRAILING_SLASH], [1], [PATHCCH_ENSURE_TRAILING_SLASH is defined])],
-		,
-		[[
-			#include <pathcch.h>
-		]]
-	)
-fi
-
 # When testing a compiler option, we add -Werror to force
 # an error when the option is unsupported. This is not
 # required for gcc, but some compilers such as clang need it.
diff --git a/src/openvpnserv/CMakeLists.txt b/src/openvpnserv/CMakeLists.txt
index a92ee08..2c8f310 100644
--- a/src/openvpnserv/CMakeLists.txt
+++ b/src/openvpnserv/CMakeLists.txt
@@ -8,9 +8,6 @@ 
 
 include(CheckSymbolExists)
 
-# Some old versions of mingw does not have PATHCCH_OPTIONS enums -- add a check
-check_symbol_exists(PATHCCH_ENSURE_TRAILING_SLASH pathcch.h HAVE_PATHCCH_ENSURE_TRAILING_SLASH)
-
 set(MC_GEN_DIR ${CMAKE_CURRENT_BINARY_DIR}/mc)
 
 target_include_directories(openvpnserv PRIVATE
diff --git a/src/openvpnserv/validate.c b/src/openvpnserv/validate.c
index 2dcfe1a..b3189b7 100644
--- a/src/openvpnserv/validate.c
+++ b/src/openvpnserv/validate.c
@@ -27,10 +27,6 @@ 
 #include <pathcch.h>
 #include <lm.h>
 
-#ifndef HAVE_PATHCCH_ENSURE_TRAILING_SLASH
-#define PATHCCH_ENSURE_TRAILING_SLASH 0x20
-#endif
-
 static const WCHAR *white_list[] = {
     L"auth-retry",
     L"config",