krb5_kt_default_name should take an unsized length

The internal code to krb5_kt_default_name was casting the length to size_t.
Change prototype to take an unsigned - which makes sense in how the code uses
it.

ticket: new

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

diff --git a/src/include/krb5/krb5.hin b/src/include/krb5/krb5.hin
index a404b25317541efecc67774b704ee2edaa67d1d7..cfaa90493e3712a78cfe81f67434da29831c3993 100644 (file)
--- a/src/include/krb5/krb5.hin
+++ b/src/include/krb5/krb5.hin
@@ -1573,7 +1573,7 @@ krb5_error_code KRB5_CALLCONV krb5_kt_resolve
 krb5_error_code KRB5_CALLCONV krb5_kt_default_name
        (krb5_context,
                char *,
-               int );
+               size_t );
 krb5_error_code KRB5_CALLCONV krb5_kt_default
        (krb5_context,
                krb5_keytab * );

diff --git a/src/lib/krb5/os/ktdefname.c b/src/lib/krb5/os/ktdefname.c
index 62465f102b3ed9d7c101f2a9a6022882b2e37218..925b6e1b5b9a2e2625744b09e3fd7fd177a68a26 100644 (file)
--- a/src/lib/krb5/os/ktdefname.c
+++ b/src/lib/krb5/os/ktdefname.c
@@ -37,18 +37,18 @@ extern char *krb5_defkeyname;
 char *krb5_overridekeyname = NULL;
 
 krb5_error_code KRB5_CALLCONV
-krb5_kt_default_name(krb5_context context, char *name, int namesize)
+krb5_kt_default_name(krb5_context context, char *name, size_t namesize)
 {
     char *cp = 0;
     char *retval;
 
     if (krb5_overridekeyname) {
-       if ((size_t) namesize < (strlen(krb5_overridekeyname)+1))
+       if (namesize < (strlen(krb5_overridekeyname)+1))
            return KRB5_CONFIG_NOTENUFSPACE;
        strcpy(name, krb5_overridekeyname);
     } else if ((context->profile_secure == FALSE) &&
        (cp = getenv("KRB5_KTNAME"))) {
-       if ((size_t) namesize < (strlen(cp)+1))
+       if (namesize < (strlen(cp)+1))
            return KRB5_CONFIG_NOTENUFSPACE;
        strcpy(name, cp);
     } else if ((profile_get_string(context->profile,
@@ -56,7 +56,7 @@ krb5_kt_default_name(krb5_context context, char *name, int namesize)
                                   "default_keytab_name", NULL, 
                                   NULL, &retval) == 0) &&
               retval) {
-       if ((size_t) namesize < (strlen(retval)+1))
+       if (namesize < (strlen(retval)+1))
            return KRB5_CONFIG_NOTENUFSPACE;
        strcpy(name, retval);
        profile_release_string(retval);
@@ -73,7 +73,7 @@ krb5_kt_default_name(krb5_context context, char *name, int namesize)
            sprintf(name, krb5_defkeyname, defname);
        }
 #else
-       if ((size_t) namesize < (strlen(krb5_defkeyname)+1))
+       if (namesize < (strlen(krb5_defkeyname)+1))
            return KRB5_CONFIG_NOTENUFSPACE;
        strcpy(name, krb5_defkeyname);
 #endif