Skip to content

Commit 6032d18

Browse files
rmetrichstevegrubb
authored andcommitted
Move fapolicyd-rpm-loader to libexec
The loader is an internal helper spawned by the daemon via posix_spawn, not a user-facing executable. Move from bin_PROGRAMS to libexec_PROGRAMS and rename the BINARYDIR define to LIBEXECDIR. Update fapolicyd.spec to match the new install path.
1 parent ec3b1b5 commit 6032d18

3 files changed

Lines changed: 4 additions & 4 deletions

File tree

fapolicyd.spec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@ fi
253253
%attr(755,root,root) %{_sbindir}/%{name}
254254
%attr(755,root,root) %{_sbindir}/%{name}-cli
255255
%attr(755,root,root) %{_sbindir}/%{name}-perf-test
256-
%attr(755,root,root) %{_bindir}/%{name}-rpm-loader
256+
%attr(755,root,root) %{_libexecdir}/%{name}-rpm-loader
257257
%attr(755,root,root) %{_sbindir}/fagenrules
258258
%attr(644,root,root) %{_mandir}/man8/*
259259
%attr(644,root,root) %{_mandir}/man5/*

src/Makefile.am

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,12 +105,12 @@ if WITH_RPM
105105
libfapolicyd_la_SOURCES += \
106106
library/rpm-backend.c
107107

108-
bin_PROGRAMS = fapolicyd-rpm-loader
108+
libexec_PROGRAMS = fapolicyd-rpm-loader
109109

110110
fapolicyd_rpm_loader_SOURCES = \
111111
handler/fapolicyd-rpm-loader.c
112112

113-
fapolicyd_CFLAGS += -DBINARYDIR='"$(bindir)"'
113+
fapolicyd_CFLAGS += -DLIBEXECDIR='"$(libexecdir)"'
114114
fapolicyd_rpm_loader_CFLAGS = $(fapolicyd_CFLAGS)
115115
fapolicyd_rpm_loader_LDFLAGS = $(fapolicyd_LDFLAGS)
116116
fapolicyd_rpm_loader_LDADD = libfapolicyd.la

src/library/rpm-backend.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ struct _hash_record {
217217

218218
#define BUFFER_SIZE 4096
219219
#define MAX_DELIMS 3 // Trustdb has 4 fields - therefore 3 delimiters
220-
static const char *rpm_loader_path = BINARYDIR "/fapolicyd-rpm-loader";
220+
static const char *rpm_loader_path = LIBEXECDIR "/fapolicyd-rpm-loader";
221221

222222
static int rpm_load_list(const conf_t *conf)
223223
{

0 commit comments

Comments
 (0)