[krb5] update for 1.10
Nalin Dahyabhai
nalin at fedoraproject.org
Tue Nov 15 17:47:24 UTC 2011
commit dc853050a14ffd6c342fa20d3c46f662d770bed1
Author: Nalin Dahyabhai <nalin at dahyabhai.net>
Date: Wed Nov 9 16:21:31 2011 -0500
update for 1.10
...-ksu-access.patch => krb5-1.10-ksu-access.patch | 24 +++++++++----------
1 files changed, 11 insertions(+), 13 deletions(-)
---
diff --git a/krb5-1.8-ksu-access.patch b/krb5-1.10-ksu-access.patch
similarity index 62%
rename from krb5-1.8-ksu-access.patch
rename to krb5-1.10-ksu-access.patch
index 75f7755..ca155f7 100644
--- a/krb5-1.8-ksu-access.patch
+++ b/krb5-1.10-ksu-access.patch
@@ -1,10 +1,10 @@
The idea is to not complain about problems in the default ticket file if we
couldn't read it, because the client would be able to tell if it's there or
-not. Still needs work, I think.
+not, and we're implicitly letting the client tell us where it is. Still needs
+work, I think.
-diff -up krb5-1.8/src/clients/ksu/ccache.c.ksu-access krb5-1.8/src/clients/ksu/ccache.c
---- krb5-1.8/src/clients/ksu/ccache.c.ksu-access 2009-10-30 20:48:38.000000000 -0400
-+++ krb5-1.8/src/clients/ksu/ccache.c 2010-03-05 10:57:56.000000000 -0500
+--- krb5/src/clients/ksu/ccache.c
++++ krb5/src/clients/ksu/ccache.c
@@ -78,7 +78,7 @@ krb5_error_code krb5_ccache_copy (contex
cc_def_name = krb5_cc_get_name(context, cc_def);
cc_other_name = krb5_cc_get_name(context, *cc_other);
@@ -14,9 +14,8 @@ diff -up krb5-1.8/src/clients/ksu/ccache.c.ksu-access krb5-1.8/src/clients/ksu/c
if((retval = krb5_get_nonexp_tkts(context,cc_def,&cc_def_creds_arr))){
return retval;
}
-diff -up krb5-1.8/src/clients/ksu/heuristic.c.ksu-access krb5-1.8/src/clients/ksu/heuristic.c
---- krb5-1.8/src/clients/ksu/heuristic.c.ksu-access 2009-10-30 20:48:38.000000000 -0400
-+++ krb5-1.8/src/clients/ksu/heuristic.c 2010-03-05 10:57:56.000000000 -0500
+--- krb5/src/clients/ksu/heuristic.c
++++ krb5/src/clients/ksu/heuristic.c
@@ -409,7 +409,7 @@ krb5_error_code find_either_ticket (cont
cc_source_name = krb5_cc_get_name(context, cc);
@@ -35,15 +34,14 @@ diff -up krb5-1.8/src/clients/ksu/heuristic.c.ksu-access krb5-1.8/src/clients/ks
retval = krb5_cc_get_principal(context, cc_source, &cc_def_princ);
if (retval)
return retval;
-diff -up krb5-1.8/src/clients/ksu/main.c.ksu-access krb5-1.8/src/clients/ksu/main.c
---- krb5-1.8/src/clients/ksu/main.c.ksu-access 2010-03-05 10:57:55.000000000 -0500
-+++ krb5-1.8/src/clients/ksu/main.c 2010-03-05 10:57:56.000000000 -0500
+--- krb5/src/clients/ksu/main.c
++++ krb5/src/clients/ksu/main.c
@@ -270,7 +270,7 @@ main (argc, argv)
if ( strchr(cc_source_tag, ':')){
cc_source_tag_tmp = strchr(cc_source_tag, ':') + 1;
- if( stat( cc_source_tag_tmp, &st_temp)){
+ if( access( cc_source_tag_tmp, F_OK | R_OK) || stat( cc_source_tag_tmp, &st_temp)){
- com_err (prog_name, errno,
- "while looking for credentials file %s",
- cc_source_tag_tmp);
+ com_err(prog_name, errno,
+ _("while looking for credentials file %s"),
+ cc_source_tag_tmp);
More information about the scm-commits
mailing list