update for 1.10
This commit is contained in:
parent
0fde11f889
commit
dc853050a1
@ -1,10 +1,10 @@
|
|||||||
The idea is to not complain about problems in the default ticket file if we
|
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
|
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/src/clients/ksu/ccache.c
|
||||||
--- krb5-1.8/src/clients/ksu/ccache.c.ksu-access 2009-10-30 20:48:38.000000000 -0400
|
+++ krb5/src/clients/ksu/ccache.c
|
||||||
+++ krb5-1.8/src/clients/ksu/ccache.c 2010-03-05 10:57:56.000000000 -0500
|
|
||||||
@@ -78,7 +78,7 @@ krb5_error_code krb5_ccache_copy (contex
|
@@ -78,7 +78,7 @@ krb5_error_code krb5_ccache_copy (contex
|
||||||
cc_def_name = krb5_cc_get_name(context, cc_def);
|
cc_def_name = krb5_cc_get_name(context, cc_def);
|
||||||
cc_other_name = krb5_cc_get_name(context, *cc_other);
|
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))){
|
if((retval = krb5_get_nonexp_tkts(context,cc_def,&cc_def_creds_arr))){
|
||||||
return retval;
|
return retval;
|
||||||
}
|
}
|
||||||
diff -up krb5-1.8/src/clients/ksu/heuristic.c.ksu-access krb5-1.8/src/clients/ksu/heuristic.c
|
--- krb5/src/clients/ksu/heuristic.c
|
||||||
--- krb5-1.8/src/clients/ksu/heuristic.c.ksu-access 2009-10-30 20:48:38.000000000 -0400
|
+++ krb5/src/clients/ksu/heuristic.c
|
||||||
+++ krb5-1.8/src/clients/ksu/heuristic.c 2010-03-05 10:57:56.000000000 -0500
|
|
||||||
@@ -409,7 +409,7 @@ krb5_error_code find_either_ticket (cont
|
@@ -409,7 +409,7 @@ krb5_error_code find_either_ticket (cont
|
||||||
|
|
||||||
cc_source_name = krb5_cc_get_name(context, cc);
|
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);
|
retval = krb5_cc_get_principal(context, cc_source, &cc_def_princ);
|
||||||
if (retval)
|
if (retval)
|
||||||
return retval;
|
return retval;
|
||||||
diff -up krb5-1.8/src/clients/ksu/main.c.ksu-access krb5-1.8/src/clients/ksu/main.c
|
--- krb5/src/clients/ksu/main.c
|
||||||
--- krb5-1.8/src/clients/ksu/main.c.ksu-access 2010-03-05 10:57:55.000000000 -0500
|
+++ krb5/src/clients/ksu/main.c
|
||||||
+++ krb5-1.8/src/clients/ksu/main.c 2010-03-05 10:57:56.000000000 -0500
|
|
||||||
@@ -270,7 +270,7 @@ main (argc, argv)
|
@@ -270,7 +270,7 @@ main (argc, argv)
|
||||||
if ( strchr(cc_source_tag, ':')){
|
if ( strchr(cc_source_tag, ':')){
|
||||||
cc_source_tag_tmp = strchr(cc_source_tag, ':') + 1;
|
cc_source_tag_tmp = strchr(cc_source_tag, ':') + 1;
|
||||||
|
|
||||||
- if( stat( cc_source_tag_tmp, &st_temp)){
|
- 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)){
|
+ if( access( cc_source_tag_tmp, F_OK | R_OK) || stat( cc_source_tag_tmp, &st_temp)){
|
||||||
com_err (prog_name, errno,
|
com_err(prog_name, errno,
|
||||||
"while looking for credentials file %s",
|
_("while looking for credentials file %s"),
|
||||||
cc_source_tag_tmp);
|
cc_source_tag_tmp);
|
Loading…
Reference in New Issue
Block a user