One of the recent patches broke setting the clients dir in the configuration file. Patch attached.
Simo.
On (29/03/15 18:26), Simo Sorce wrote:
One of the recent patches broke setting the clients dir in the configuration file. Patch attached.
Simo.
-- Simo Sorce * Red Hat, Inc * New York
From d2aee1ec4bf4ebf77373886c8eea345f71c01d2b Mon Sep 17 00:00:00 2001 From: Simo Sorce simo@redhat.com Date: Sun, 29 Mar 2015 18:19:34 -0400 Subject: [PATCH] Fix configuration file substitutions
Fixes: https://fedorahosted.org/gss-proxy/ticket/138
Signed-off-by: Simo Sorce simo@redhat.com
proxy/Makefile.am | 2 +- proxy/examples/gssproxy.conf.in | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/proxy/Makefile.am b/proxy/Makefile.am index 1e7c39cf2c2d3ef2c96c1b28c76d53d378054da6..599278d90dc55e3c4e8f2d5a2617cccb543aa4e5 100644 --- a/proxy/Makefile.am +++ b/proxy/Makefile.am @@ -234,7 +234,7 @@ edit_cmd = $(SED) \ -e 's|@sbindir[@]|$(sbindir)|g' \ -e 's|@localstatedir[@]|$(localstatedir)|g' \ -e 's|@libdir[@]|$(libdir)|g' \
- -e 's|@gpstatedir[@]|$(prefix)|g'
- -e 's|@gpclidir[@]|$(gpclidir)|g'
replace_script = \ @rm -f $@ $@.tmp; \ diff --git a/proxy/examples/gssproxy.conf.in b/proxy/examples/gssproxy.conf.in index f12119998a0efe7edf6c06e92cd455b00539fdab..321a4e7552a1dab71fc92117ee5960f3f1a34044 100644 --- a/proxy/examples/gssproxy.conf.in +++ b/proxy/examples/gssproxy.conf.in @@ -11,8 +11,8 @@ [service/nfs-client] mechs = krb5 cred_store = keytab:/etc/krb5.keytab
- cred_store = ccache:FILE:@gpstatedir@/clients/krb5cc_%U
- cred_store = client_keytab:@gpstatedir@/clients/%U.keytab
- cred_store = ccache:FILE:@gpclidir@/krb5cc_%U
- cred_store = client_keytab:@gpclidir@/%U.keytab cred_usage = initiate allow_any_uid = yes trusted = yes
Before: cred_store = ccache:FILE:/usr/clients/krb5cc_%U cred_store = client_keytab:/usr/clients/%U.keytab
After: cred_store = ccache:FILE:/var/lib/gssproxy/clients/krb5cc_%U cred_store = client_keytab:/var/lib/gssproxy/clients/%U.keytab
ACK
LS
On Mon, 2015-03-30 at 10:18 +0200, Lukas Slebodnik wrote:
On (29/03/15 18:26), Simo Sorce wrote:
One of the recent patches broke setting the clients dir in the configuration file. Patch attached.
Simo.
-- Simo Sorce * Red Hat, Inc * New York
From d2aee1ec4bf4ebf77373886c8eea345f71c01d2b Mon Sep 17 00:00:00 2001 From: Simo Sorce simo@redhat.com Date: Sun, 29 Mar 2015 18:19:34 -0400 Subject: [PATCH] Fix configuration file substitutions
Fixes: https://fedorahosted.org/gss-proxy/ticket/138
Signed-off-by: Simo Sorce simo@redhat.com
proxy/Makefile.am | 2 +- proxy/examples/gssproxy.conf.in | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/proxy/Makefile.am b/proxy/Makefile.am index 1e7c39cf2c2d3ef2c96c1b28c76d53d378054da6..599278d90dc55e3c4e8f2d5a2617cccb543aa4e5 100644 --- a/proxy/Makefile.am +++ b/proxy/Makefile.am @@ -234,7 +234,7 @@ edit_cmd = $(SED) \ -e 's|@sbindir[@]|$(sbindir)|g' \ -e 's|@localstatedir[@]|$(localstatedir)|g' \ -e 's|@libdir[@]|$(libdir)|g' \
- -e 's|@gpstatedir[@]|$(prefix)|g'
- -e 's|@gpclidir[@]|$(gpclidir)|g'
replace_script = \ @rm -f $@ $@.tmp; \ diff --git a/proxy/examples/gssproxy.conf.in b/proxy/examples/gssproxy.conf.in index f12119998a0efe7edf6c06e92cd455b00539fdab..321a4e7552a1dab71fc92117ee5960f3f1a34044 100644 --- a/proxy/examples/gssproxy.conf.in +++ b/proxy/examples/gssproxy.conf.in @@ -11,8 +11,8 @@ [service/nfs-client] mechs = krb5 cred_store = keytab:/etc/krb5.keytab
- cred_store = ccache:FILE:@gpstatedir@/clients/krb5cc_%U
- cred_store = client_keytab:@gpstatedir@/clients/%U.keytab
- cred_store = ccache:FILE:@gpclidir@/krb5cc_%U
- cred_store = client_keytab:@gpclidir@/%U.keytab cred_usage = initiate allow_any_uid = yes trusted = yes
Before: cred_store = ccache:FILE:/usr/clients/krb5cc_%U cred_store = client_keytab:/usr/clients/%U.keytab
After: cred_store = ccache:FILE:/var/lib/gssproxy/clients/krb5cc_%U cred_store = client_keytab:/var/lib/gssproxy/clients/%U.keytab
ACK
Pushed to master
gss-proxy@lists.fedorahosted.org