win: remove checks for PATHCCH_ENSURE_TRAILING_SLASH

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
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>

diff --git a/configure.ac b/configure.ac
index f6e4b6d78b98a645caeaa0c19eb8b2d4958b106f..44c7b653c5643ec142fda8267ac6583006f4787b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1383,17 +1383,6 @@ if test "${enable_pkcs11}" = "yes"; then
        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 a92ee08c6048fb0103dce16f24e195afca7ea63e..2c8f310eab05866003b77fad8bc7749bed6182a3 100644 (file)
--- a/src/openvpnserv/CMakeLists.txt
+++ b/src/openvpnserv/CMakeLists.txt
@@ -8,9 +8,6 @@ add_executable(openvpnserv)
 
 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 2dcfe1ae57fbc887cc453d69ffb6f4180abd554d..b3189b775cd63532c46828d5c25372e0f9a4ca22 100644 (file)
--- 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",