GitLab/ocserv
1
0
Fork 0
mirror of https://gitlab.com/openconnect/ocserv.git synced 2026-10-10 08:12:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into 'master'

Browse Source 
Make path to ocserv-fw script conform to config prefix

See merge request openconnect/ocserv!448
This commit is contained in:
Dimitri Papadopoulos Orfanos
2025-03-25 22:18:56 +01:00
parent 30de6d0b44 58263db779
commit 43bd5d48c9
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Makefile.am
+2 -1
View File
@@ -6,7 +6,8 @@ AM_CPPFLAGS += \
$(LIBPROTOBUF_C_CFLAGS) $(LIBLZ4_CFLAGS) \ $(LIBPROTOBUF_C_CFLAGS) $(LIBLZ4_CFLAGS) \
$(LIBREADLINE_CFLAGS) $(CODE_COVERAGE_CFLAGS) \ $(LIBREADLINE_CFLAGS) $(CODE_COVERAGE_CFLAGS) \
$(LIBTALLOC_CFLAGS) $(LIBDBUS_CFLAGS) $(LIBOATH_CFLAGS) \ $(LIBTALLOC_CFLAGS) $(LIBDBUS_CFLAGS) $(LIBOATH_CFLAGS) \
$(LIBKRB5_CFLAGS) $(LIBTASN1_CFLAGS) $(RADCLI_CFLAGS) $(SRC_CFLAGS) $(LIBKRB5_CFLAGS) $(LIBTASN1_CFLAGS) $(RADCLI_CFLAGS) $(SRC_CFLAGS) \
-DOCSERV_FW_SCRIPT=\"${libexecdir}/ocserv-fw\"
if ENABLE_OIDC_AUTH if ENABLE_OIDC_AUTH
AM_CPPFLAGS += $(LIBCURL_CFLAGS) $(CJOSE_CFLAGS) $(JANSSON_CFLAGS) AM_CPPFLAGS += $(LIBCURL_CFLAGS) $(CJOSE_CFLAGS) $(JANSSON_CFLAGS)
src/main-user.c
+2
View File
@@ -47,7 +47,9 @@
#include <script-list.h> #include <script-list.h>
#include <ccan/list/list.h> #include <ccan/list/list.h>
#ifndef OCSERV_FW_SCRIPT
#define OCSERV_FW_SCRIPT "/usr/libexec/ocserv-fw" #define OCSERV_FW_SCRIPT "/usr/libexec/ocserv-fw"
#endif
#define APPEND_TO_STR(str, val) \ #define APPEND_TO_STR(str, val) \
do { \ do { \