diff options
| author | Günther Deschner <gdeschner@redhat.com> | 2013-04-29 17:42:21 +0200 |
|---|---|---|
| committer | Günther Deschner <gdeschner@redhat.com> | 2013-05-06 15:00:10 +0200 |
| commit | 918fb6db56b7ac9683f557cfdca553af730f2cca (patch) | |
| tree | c7b3f212480cac0c544912412f7ca3a39d549410 | |
| parent | 50a785636f71bc122a4ab9dd833b6ac083107891 (diff) | |
| download | gss-proxy-918fb6db56b7ac9683f557cfdca553af730f2cca.tar.gz gss-proxy-918fb6db56b7ac9683f557cfdca553af730f2cca.tar.xz gss-proxy-918fb6db56b7ac9683f557cfdca553af730f2cca.zip | |
Add --with-gpstate-path=PATH configure switch.
Signed-off-by: Günther Deschner <gdeschner@redhat.com>
Reviewed-by: Simo Sorce <simo@redhat.com>
| -rw-r--r-- | proxy/Makefile.am | 4 | ||||
| -rw-r--r-- | proxy/conf_macros.m4 | 17 | ||||
| -rw-r--r-- | proxy/configure.ac | 1 | ||||
| -rw-r--r-- | proxy/examples/gssproxy.conf.in | 4 |
4 files changed, 22 insertions, 4 deletions
diff --git a/proxy/Makefile.am b/proxy/Makefile.am index 04027d6..3f1d0ee 100644 --- a/proxy/Makefile.am +++ b/proxy/Makefile.am @@ -27,8 +27,8 @@ logpath = @logpath@ pubconfpath = @pubconfpath@ pkgconfigdir = $(libdir)/pkgconfig -gpstatedir = $(localstatedir)/lib/gssproxy -gpclidir = $(gpstatedir)/clients +gpstatedir = @gpstatedir@ +gpclidir = @gpstatedir@/clients AM_CFLAGS = if WANT_AUX_INFO diff --git a/proxy/conf_macros.m4 b/proxy/conf_macros.m4 index a92c24a..d474c7a 100644 --- a/proxy/conf_macros.m4 +++ b/proxy/conf_macros.m4 @@ -219,6 +219,23 @@ AC_DEFUN([WITH_CC_PATH], AC_DEFINE_UNQUOTED(CCACHE_PATH, "$config_ccpath", [Where to store ccache files for gssproxy]) ]) +AC_DEFUN([WITH_GPSTATE_PATH], + [ AC_ARG_WITH([gpstate-path], + [AC_HELP_STRING([--with-gpstate-path=PATH], + [Where to create default socket for gssproxy [/var/lib/gssproxy]] + ) + ] + ) + config_gpstatepath="\"VARDIR\"/lib/gssproxy" + gpstatedir="${localstatedir}/lib/gssproxy" + if test x"$with_gpstate_path" != x; then + config_gpstatepath=$with_gpstate_path + gpstatepath=$with_gpstate_path + fi + AC_SUBST(gpstatedir) + AC_DEFINE_UNQUOTED(GPSTATE_PATH, "$config_gpstatepath", [Where to store ccache files for gssproxy]) + ]) + AC_DEFUN([WITH_GSSIDEBUG], [ AC_ARG_WITH([gssidebug], [AC_HELP_STRING([--with-gssidebug], diff --git a/proxy/configure.ac b/proxy/configure.ac index a565b24..770ab19 100644 --- a/proxy/configure.ac +++ b/proxy/configure.ac @@ -66,6 +66,7 @@ WITH_MANPAGES WITH_XML_CATALOG WITH_SELINUX WITH_GSSIDEBUG +WITH_GPSTATE_PATH m4_include([external/pkg.m4]) m4_include([external/libpopt.m4]) diff --git a/proxy/examples/gssproxy.conf.in b/proxy/examples/gssproxy.conf.in index 7343806..68db4bf 100644 --- a/proxy/examples/gssproxy.conf.in +++ b/proxy/examples/gssproxy.conf.in @@ -3,8 +3,8 @@ [service/nfs] mechs = krb5 cred_store = keytab:/etc/krb5.keytab - cred_store = ccache:FILE:@gpclidir@/krb5cc_%U - cred_store = client_keytab:@gpclidir@/%U.keytab + cred_store = ccache:FILE:@gpstatedir@/clients/krb5cc_%U + cred_store = client_keytab:@gpstatedir@/clients/%U.keytab trusted = yes kernel_nfsd = yes euid = 0 |