diff options
| author | Steve Dickson <steved@redhat.com> | 2016-08-24 14:56:07 -0400 |
|---|---|---|
| committer | Steve Dickson <steved@redhat.com> | 2016-08-25 07:44:10 -0400 |
| commit | ce2737b5ca3e1b7e5ea14c21a67cbc92fcc558be (patch) | |
| tree | 545564a2753f34d726348ea2306772eab868086f | |
| parent | 8cf1e023c9c110087c79daac0a083b5e04458304 (diff) | |
| download | nfs-utils-ce2737b5ca3e1b7e5ea14c21a67cbc92fcc558be.tar.gz nfs-utils-ce2737b5ca3e1b7e5ea14c21a67cbc92fcc558be.tar.xz nfs-utils-ce2737b5ca3e1b7e5ea14c21a67cbc92fcc558be.zip | |
rpc-gssd: Make the path to the keytab configurable.
Kerberos keytabs don't always live in the '/etc'
directory. Allow --sysconfdir flag to define where
the keytab directory is in rpc-gssd.service
Signed-off-by: Steve Dickson <steved@redhat.com>
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | configure.ac | 6 | ||||
| -rw-r--r-- | systemd/rpc-gssd.service.in (renamed from systemd/rpc-gssd.service) | 2 |
3 files changed, 8 insertions, 1 deletions
@@ -71,6 +71,7 @@ tests/nsm_client/nlm_sm_inter_xdr.c utils/nfsidmap/nfsidmap systemd/nfs-server-generator systemd/nfs-config.service +systemd/rpc-gssd.service # cscope database files cscope.* # generic editor backup et al diff --git a/configure.ac b/configure.ac index 4fb108f..d60f3a2 100644 --- a/configure.ac +++ b/configure.ac @@ -516,9 +516,15 @@ AC_SUBST([ACLOCAL_AMFLAGS], ["-I $ac_macro_dir \$(ACLOCAL_FLAGS)"]) AC_SUBST([_libexecdir]) AC_CONFIG_COMMANDS_PRE([eval eval _libexecdir=$libexecdir]) +# make _sysconfdir available for substituion in config files +# 2 "evals" needed late to expand variable names. +AC_SUBST([_sysconfdir]) +AC_CONFIG_COMMANDS_PRE([eval eval _sysconfdir=$sysconfdir]) + AC_CONFIG_FILES([ Makefile systemd/nfs-config.service + systemd/rpc-gssd.service linux-nfs/Makefile support/Makefile support/export/Makefile diff --git a/systemd/rpc-gssd.service b/systemd/rpc-gssd.service.in index d4a3819..1a7911c 100644 --- a/systemd/rpc-gssd.service +++ b/systemd/rpc-gssd.service.in @@ -5,7 +5,7 @@ Conflicts=umount.target Requires=var-lib-nfs-rpc_pipefs.mount After=var-lib-nfs-rpc_pipefs.mount -ConditionPathExists=/etc/krb5.keytab +ConditionPathExists=@_sysconfdir@/krb5.keytab PartOf=nfs-utils.service |