Add --with-gpstate-path=PATH configure switch.

Signed-off-by: Günther Deschner <[email protected]>
Reviewed-by: Simo Sorce <[email protected]>

Author: Günther Deschner

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

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],

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])

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