2eb0567065
- pull in multiple changes to allow replay caches to be added to a GSS credential store as "rcache"-type credentials (RT#7818/#7819/#7836, #1056078/#1056080)
47 lines
1.8 KiB
Diff
47 lines
1.8 KiB
Diff
commit 74ff6c4accb68bd1d6c652c55e66519720db9fc4
|
|
Author: Greg Hudson <ghudson@mit.edu>
|
|
Date: Wed Jan 15 12:31:41 2014 -0500
|
|
|
|
Make rcache resolve functions take const char *
|
|
|
|
diff --git a/src/include/k5-int.h b/src/include/k5-int.h
|
|
index bbc7fab..b4757a9 100644
|
|
--- a/src/include/k5-int.h
|
|
+++ b/src/include/k5-int.h
|
|
@@ -1887,8 +1887,10 @@ krb5_error_code KRB5_CALLCONV
|
|
krb5int_cc_user_set_default_name(krb5_context context, const char *name);
|
|
|
|
krb5_error_code krb5_rc_default(krb5_context, krb5_rcache *);
|
|
-krb5_error_code krb5_rc_resolve_type(krb5_context, krb5_rcache *,char *);
|
|
-krb5_error_code krb5_rc_resolve_full(krb5_context, krb5_rcache *,char *);
|
|
+krb5_error_code krb5_rc_resolve_type(krb5_context, krb5_rcache *,
|
|
+ const char *);
|
|
+krb5_error_code krb5_rc_resolve_full(krb5_context, krb5_rcache *,
|
|
+ const char *);
|
|
char *krb5_rc_get_type(krb5_context, krb5_rcache);
|
|
char *krb5_rc_default_type(krb5_context);
|
|
char *krb5_rc_default_name(krb5_context);
|
|
diff --git a/src/lib/krb5/rcache/rc_base.c b/src/lib/krb5/rcache/rc_base.c
|
|
index 2fc96c5..373ac30 100644
|
|
--- a/src/lib/krb5/rcache/rc_base.c
|
|
+++ b/src/lib/krb5/rcache/rc_base.c
|
|
@@ -65,7 +65,8 @@ krb5_rc_register_type(krb5_context context, const krb5_rc_ops *ops)
|
|
}
|
|
|
|
krb5_error_code
|
|
-krb5_rc_resolve_type(krb5_context context, krb5_rcache *idptr, char *type)
|
|
+krb5_rc_resolve_type(krb5_context context, krb5_rcache *idptr,
|
|
+ const char *type)
|
|
{
|
|
struct krb5_rc_typelist *t;
|
|
krb5_error_code err;
|
|
@@ -146,7 +147,7 @@ krb5_rc_default(krb5_context context, krb5_rcache *idptr)
|
|
|
|
krb5_error_code
|
|
krb5_rc_resolve_full(krb5_context context, krb5_rcache *idptr,
|
|
- char *string_name)
|
|
+ const char *string_name)
|
|
{
|
|
char *type;
|
|
char *residual;
|