From 97e6223a59a6c369fd59ac02f535ca17133c1bb2 Mon Sep 17 00:00:00 2001 From: Ezra Peisach Date: Tue, 3 Oct 2000 16:03:35 +0000 Subject: * ser_cc.c (krb5_ccache_externalize): Use krb5_cc_get_name instead of krb5_rc_get_name on credential cache. * cc_file.c (krb5_fcc_get_name): * cc_stdio.c (krb5_scc_get_name): * cc_memory.c (krb5_mcc_get_name): * ccfns.c (krb5_cc_get_name): Declare as returning const char *. git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@12707 dc483132-0cff-0310-8789-dd5450dbe970 --- src/lib/krb5/ccache/ChangeLog | 10 ++++++++++ src/lib/krb5/ccache/cc_file.c | 4 ++-- src/lib/krb5/ccache/cc_memory.c | 4 ++-- src/lib/krb5/ccache/cc_stdio.c | 4 ++-- src/lib/krb5/ccache/ccfns.c | 2 +- src/lib/krb5/ccache/ser_cc.c | 6 +++--- 6 files changed, 20 insertions(+), 10 deletions(-) (limited to 'src/lib') diff --git a/src/lib/krb5/ccache/ChangeLog b/src/lib/krb5/ccache/ChangeLog index e1eb808d88..556eda1a50 100644 --- a/src/lib/krb5/ccache/ChangeLog +++ b/src/lib/krb5/ccache/ChangeLog @@ -1,3 +1,13 @@ +2000-10-03 Ezra Peisach + + * ser_cc.c (krb5_ccache_externalize): Use krb5_cc_get_name instead + of krb5_rc_get_name on credential cache. + + * cc_file.c (krb5_fcc_get_name): + * cc_stdio.c (krb5_scc_get_name): + * cc_memory.c (krb5_mcc_get_name): + * ccfns.c (krb5_cc_get_name): Declare as returning const char *. + 2000-09-25 Ezra Peisach * cc_file.c ccbase.c, cc_stdio.c, cc_retr.c, cc_memory.c: More diff --git a/src/lib/krb5/ccache/cc_file.c b/src/lib/krb5/ccache/cc_file.c index fc092f0af2..c70c4ae364 100644 --- a/src/lib/krb5/ccache/cc_file.c +++ b/src/lib/krb5/ccache/cc_file.c @@ -104,7 +104,7 @@ KRB5_DLLIMP krb5_error_code KRB5_CALLCONV krb5_fcc_end_seq_get KRB5_DLLIMP krb5_error_code KRB5_CALLCONV krb5_fcc_generate_new KRB5_PROTOTYPE((krb5_context, krb5_ccache *id )); -KRB5_DLLIMP char * KRB5_CALLCONV krb5_fcc_get_name +KRB5_DLLIMP const char * KRB5_CALLCONV krb5_fcc_get_name KRB5_PROTOTYPE((krb5_context, krb5_ccache id )); KRB5_DLLIMP krb5_error_code KRB5_CALLCONV krb5_fcc_get_principal @@ -1841,7 +1841,7 @@ err_out: * Returns: * The name of the file cred cache id. */ -char * KRB5_CALLCONV +const char * KRB5_CALLCONV krb5_fcc_get_name (context, id) krb5_context context; krb5_ccache id; diff --git a/src/lib/krb5/ccache/cc_memory.c b/src/lib/krb5/ccache/cc_memory.c index c7e0a43141..04b290aa95 100644 --- a/src/lib/krb5/ccache/cc_memory.c +++ b/src/lib/krb5/ccache/cc_memory.c @@ -46,7 +46,7 @@ krb5_error_code KRB5_CALLCONV krb5_mcc_end_seq_get krb5_error_code KRB5_CALLCONV krb5_mcc_generate_new PROTOTYPE((krb5_context, krb5_ccache *id )); -char * KRB5_CALLCONV krb5_mcc_get_name +const char * KRB5_CALLCONV krb5_mcc_get_name PROTOTYPE((krb5_context, krb5_ccache id )); krb5_error_code KRB5_CALLCONV krb5_mcc_get_principal @@ -474,7 +474,7 @@ krb5_mcc_generate_new (context, id) * Returns: * The name of the file cred cache id. */ -char * KRB5_CALLCONV +const char * KRB5_CALLCONV krb5_mcc_get_name (context, id) krb5_context context; krb5_ccache id; diff --git a/src/lib/krb5/ccache/cc_stdio.c b/src/lib/krb5/ccache/cc_stdio.c index d647ad1273..756b68a4cc 100644 --- a/src/lib/krb5/ccache/cc_stdio.c +++ b/src/lib/krb5/ccache/cc_stdio.c @@ -99,7 +99,7 @@ krb5_error_code KRB5_CALLCONV krb5_scc_generate_new PROTOTYPE((krb5_context, krb5_ccache *id )); -char * KRB5_CALLCONV krb5_scc_get_name +const char * KRB5_CALLCONV krb5_scc_get_name PROTOTYPE((krb5_context, krb5_ccache id )); @@ -1916,7 +1916,7 @@ err_out: * Returns: * The name of the file cred cache id. */ -char * +const char * KRB5_CALLCONV krb5_scc_get_name (context, id) krb5_context context; diff --git a/src/lib/krb5/ccache/ccfns.c b/src/lib/krb5/ccache/ccfns.c index f5f48fd8fb..35a17367ed 100644 --- a/src/lib/krb5/ccache/ccfns.c +++ b/src/lib/krb5/ccache/ccfns.c @@ -30,7 +30,7 @@ #include "k5-int.h" -char FAR * KRB5_CALLCONV +const char FAR * KRB5_CALLCONV krb5_cc_get_name (krb5_context context, krb5_ccache cache) { return cache->ops->get_name(context, cache); diff --git a/src/lib/krb5/ccache/ser_cc.c b/src/lib/krb5/ccache/ser_cc.c index 8c1918a5af..6bce4e3445 100644 --- a/src/lib/krb5/ccache/ser_cc.c +++ b/src/lib/krb5/ccache/ser_cc.c @@ -83,7 +83,7 @@ krb5_ccache_size(kcontext, arg, sizep) * The ccache name is formed as follows: * : */ - required += strlen(krb5_rc_get_name(kcontext, ccache)); + required += strlen(krb5_cc_get_name(kcontext, ccache)); kret = 0; *sizep += required; @@ -108,7 +108,7 @@ krb5_ccache_externalize(kcontext, arg, buffer, lenremain) size_t remain; char *ccname; size_t namelen; - char *fnamep; + const char *fnamep; required = 0; bp = *buffer; @@ -124,7 +124,7 @@ krb5_ccache_externalize(kcontext, arg, buffer, lenremain) /* Calculate the length of the name */ namelen = (ccache->ops && ccache->ops->prefix) ? strlen(ccache->ops->prefix)+1 : 0; - fnamep = krb5_rc_get_name(kcontext, ccache); + fnamep = krb5_cc_get_name(kcontext, ccache); namelen += (strlen(fnamep)+1); if ((ccname = (char *) malloc(namelen))) { -- cgit