1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
|
From 58263db7798aecbb22e82fef2ebb417d543e4155 Mon Sep 17 00:00:00 2001
From: Lee Keitel <lee@keitel.xyz>
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 <lee@keitel.xyz>
Reviewed-by: Aron Xu <aron@debian.org>
---
src/Makefile.am | 3 ++-
src/main-user.c | 2 ++
2 files changed, 4 insertions(+), 1 deletion(-)
Index: ocserv/src/Makefile.am
===================================================================
--- ocserv.orig/src/Makefile.am
+++ ocserv/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)
Index: ocserv/src/main-user.c
===================================================================
--- ocserv.orig/src/main-user.c
+++ ocserv/src/main-user.c
@@ -47,7 +47,9 @@
#include <script-list.h>
#include <ccan/list/list.h>
+#ifndef OCSERV_FW_SCRIPT
#define OCSERV_FW_SCRIPT "/usr/libexec/ocserv-fw"
+#endif
#define APPEND_TO_STR(str, val) \
do { \
|
