summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Orlitzky <michael@orlitzky.com>2017-07-31 10:36:55 -0400
committerSteve Dickson <steved@redhat.com>2017-08-23 14:47:20 -0400
commit9afccfcd5ab350d6bc72622f3d1ccfb9e54652b0 (patch)
treeef1b4d6ff06fe86f695582249a95e50178a42dd2
parent1e2ddd4ebd7a9266e6070f275fa35752752fdfd6 (diff)
downloadrpcbind-9afccfcd5ab350d6bc72622f3d1ccfb9e54652b0.tar.gz
autotools: install rpcbind to --sbindir
According to its own man page, the rpcbind program "can only be started by the super-user." On systems where a distinction is made, it therefore makes sense to install rpcbind to the autotools sbindir rather than the regular bindir where it is currently installed. This is accomplished by three small changes: 1. Move rpcbind from bin_PROGRAMS to sbin_PROGRAMS in Makefile.am. 2. Change @_bindir@ to @_sbindir@ in the rpcbind systemd service file. 3. Tell configure.ac that it should substitute the value of $sbindir into @_sbindir@ instead of $bindir$ into @_bindir@. The rpcinfo tool remains where it is, in bindir, since unprivileged users are able to usefully run it. This avoids forcing maintainers to choose between two bad options: hiding rpcinfo from unprivileged users, or installing a useless rpcbind for them. Signed-off-by: Steve Dickson <steved@redhat.com>
-rw-r--r--Makefile.am3
-rw-r--r--configure.ac6
-rw-r--r--systemd/rpcbind.service.in2
3 files changed, 6 insertions, 5 deletions
diff --git a/Makefile.am b/Makefile.am
index 43c2710..c160a95 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -29,7 +29,8 @@ if LIBWRAP
AM_CPPFLAGS += -DLIBWRAP
endif
-bin_PROGRAMS = rpcbind rpcinfo
+bin_PROGRAMS = rpcinfo
+sbin_PROGRAMS = rpcbind
rpcbind_SOURCES = \
src/check_bound.c \
diff --git a/configure.ac b/configure.ac
index 3790310..359a418 100644
--- a/configure.ac
+++ b/configure.ac
@@ -61,9 +61,9 @@ AC_SEARCH_LIBS([pthread_create], [pthread])
AC_CHECK_HEADERS([nss.h rpcsvc/mount.h])
-# make bindir available for substitution in config file
+# make sbindir available for substitution in config file
# 2 "evals" needed to expand variable names
-AC_SUBST([_bindir])
-AC_CONFIG_COMMANDS_PRE([eval eval _bindir=$bindir])
+AC_SUBST([_sbindir])
+AC_CONFIG_COMMANDS_PRE([eval eval _sbindir=$sbindir])
AC_OUTPUT([Makefile systemd/rpcbind.service])
diff --git a/systemd/rpcbind.service.in b/systemd/rpcbind.service.in
index 03a9e0b..f8cfa9f 100644
--- a/systemd/rpcbind.service.in
+++ b/systemd/rpcbind.service.in
@@ -12,7 +12,7 @@ After=rpcbind.socket
[Service]
Type=notify
# distro can provide a drop-in adding EnvironmentFile=-/??? if needed.
-ExecStart=@_bindir@/rpcbind $RPCBIND_OPTIONS -w -f
+ExecStart=@_sbindir@/rpcbind $RPCBIND_OPTIONS -w -f
[Install]
WantedBy=multi-user.target