Attention is currently required from: flichtenheld, plaisthos.
Hello plaisthos, flichtenheld,
I'd like you to do a code review.
Please visit
http://gerrit.openvpn.net/c/openvpn/+/1354?usp=email
to review the following change.
Change subject: win: remove checks for PATHCCH_ENSURE_TRAILING_SLASH
......................................................................
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 <[email protected]>
---
M configure.ac
M src/openvpnserv/CMakeLists.txt
M src/openvpnserv/validate.c
3 files changed, 0 insertions(+), 18 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/54/1354/1
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 4eb3141..b674058 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",
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/1354?usp=email
To unsubscribe, or for help writing mail filters, visit
http://gerrit.openvpn.net/settings?usp=email
Gerrit-MessageType: newchange
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I50f189048ef1a624e6ac84b71d7b22fcbbc3ab6b
Gerrit-Change-Number: 1354
Gerrit-PatchSet: 1
Gerrit-Owner: d12fk <[email protected]>
Gerrit-Reviewer: flichtenheld <[email protected]>
Gerrit-Reviewer: plaisthos <[email protected]>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]>
Gerrit-Attention: flichtenheld <[email protected]>
_______________________________________________
Openvpn-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openvpn-devel