From 58263db7798aecbb22e82fef2ebb417d543e4155 Mon Sep 17 00:00:00 2001 From: Lee Keitel Date: Tue, 25 Mar 2025 21:18:55 +0000 Subject: [PATCH] Make path to ocserv-fw script conform to config prefix Signed-off-by: default avatarLee Keitel --- src/Makefile.am | 3 ++- src/main-user.c | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/Makefile.am b/src/Makefile.am index 646f24ae..013a50a5 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -6,7 +6,8 @@ AM_CPPFLAGS += \ $(LIBPROTOBUF_C_CFLAGS) $(LIBLZ4_CFLAGS) \ $(LIBREADLINE_CFLAGS) $(CODE_COVERAGE_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 AM_CPPFLAGS += $(LIBCURL_CFLAGS) $(CJOSE_CFLAGS) $(JANSSON_CFLAGS) diff --git a/src/main-user.c b/src/main-user.c index 1fcc1e1c..a0136db7 100644 --- a/src/main-user.c +++ b/src/main-user.c @@ -47,7 +47,9 @@ #include #include +#ifndef OCSERV_FW_SCRIPT #define OCSERV_FW_SCRIPT "/usr/libexec/ocserv-fw" +#endif #define APPEND_TO_STR(str, val) \ do { \