krb5_kt_get_type should return const char *.

The code returns a pointer to static structures. Just to enforce the
assumption that users can not change the returned data.

Change prototype of krb5_kt_get_type to return const char *. The other
changes are to clean up warnings - no change in code - usage assumed const.

ticket: new

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@19143 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/include/krb5/krb5.hin b/src/include/krb5/krb5.hin
index ff0a31be7912b6e64e9941a246a572f5c0e035ec..a404b25317541efecc67774b704ee2edaa67d1d7 100644 (file)
--- a/src/include/krb5/krb5.hin
+++ b/src/include/krb5/krb5.hin
@@ -1323,7 +1323,7 @@ typedef struct krb5_keytab_entry_st {
 struct _krb5_kt;
 typedef struct _krb5_kt *krb5_keytab;
 
-char * KRB5_CALLCONV
+const char * KRB5_CALLCONV
 krb5_kt_get_type (krb5_context, krb5_keytab keytab);
 krb5_error_code KRB5_CALLCONV
 krb5_kt_get_name(krb5_context context, krb5_keytab keytab, char *name,

diff --git a/src/lib/gssapi/krb5/add_cred.c b/src/lib/gssapi/krb5/add_cred.c
index 225f125d229c227cdb1a869f4074c248635c9389..6110193953f1b32b9628851c897f93b56dd1fd03 100644 (file)
--- a/src/lib/gssapi/krb5/add_cred.c
+++ b/src/lib/gssapi/krb5/add_cred.c
@@ -179,8 +179,8 @@ krb5_gss_add_cred(minor_status, input_cred_handle,
     if (output_cred_handle) {
        /* make a copy */
        krb5_gss_cred_id_t new_cred;
-       char *kttype, ktboth[1024];
-       const char *cctype, *ccname;
+       char ktboth[1024];
+       const char *kttype, *cctype, *ccname;
        char ccboth[1024];
 
        if ((new_cred =

diff --git a/src/lib/krb5/keytab/ktfns.c b/src/lib/krb5/keytab/ktfns.c
index 63fa6399b66fd19162e86e46b1d70dcb0a2c4939..24d8eb267b01bd5268135e00cedda567b56985df 100644 (file)
--- a/src/lib/krb5/keytab/ktfns.c
+++ b/src/lib/krb5/keytab/ktfns.c
@@ -30,7 +30,7 @@
 
 #include "k5-int.h"
 
-char * KRB5_CALLCONV
+const char * KRB5_CALLCONV
 krb5_kt_get_type (krb5_context context, krb5_keytab keytab)
 {
     return keytab->ops->prefix;

diff --git a/src/lib/krb5/keytab/t_keytab.c b/src/lib/krb5/keytab/t_keytab.c
index 63e4689d8554caa95a56351c1b8ded17c10f595c..d16184e25d3fac6cda075daceb622330ba23008c 100644 (file)
--- a/src/lib/krb5/keytab/t_keytab.c
+++ b/src/lib/krb5/keytab/t_keytab.c
@@ -95,7 +95,7 @@ static void kt_test(krb5_context context, const char *name)
 {
      krb5_error_code kret;
      krb5_keytab kt;
-     char *type;
+     const char *type;
      char buf[BUFSIZ];
      char *p;
      krb5_keytab_entry kent;