Resolve a few miscellaneous warnings

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

5 files changed, 14 insertions, 15 deletions

diff --git a/src/lib/krb5/krb/bld_princ.c b/src/lib/krb5/krb/bld_princ.c
index 4b979a3914..8c17ab382b 100644
--- a/src/lib/krb5/krb/bld_princ.c
+++ b/src/lib/krb5/krb/bld_princ.c
@@ -151,21 +151,22 @@ krb5_build_principal_alloc_va(krb5_context context,
                               va_list ap)
 {
     krb5_error_code retval = 0;
+    krb5_principal p;
+    char *first;
 
-    krb5_principal p = malloc(sizeof(krb5_principal_data));
-    if (!p) { retval = ENOMEM; }
-
-    if (!retval) {
-        retval = krb5_build_principal_va(context, p, rlen, realm, ap);
-    }
+    p = malloc(sizeof(krb5_principal_data));
+    if (p == NULL)
+        return ENOMEM;
 
-    if (!retval) {
-        *princ = p;
-    } else {
+    first = va_arg(ap, char *);
+    retval = krb5int_build_principal_va(context, p, rlen, realm, first, ap);
+    if (retval) {
         free(p);
+        return retval;
     }
 
-    return retval;
+    *princ = p;
+    return 0;
 }
 
 krb5_error_code KRB5_CALLCONV_C
diff --git a/src/lib/krb5/krb/chpw.c b/src/lib/krb5/krb/chpw.c
index 1488f627ea..3f359ba716 100644
--- a/src/lib/krb5/krb/chpw.c
+++ b/src/lib/krb5/krb/chpw.c
@@ -78,7 +78,7 @@ krb5int_rd_chpw_rep(krb5_context context, krb5_auth_context auth_context,
                     krb5_data *packet, int *result_code, krb5_data *result_data)
 {
     char *ptr;
-    int plen, vno;
+    unsigned int plen, vno;
     krb5_data ap_rep;
     krb5_ap_rep_enc_part *ap_rep_enc;
     krb5_error_code ret;
diff --git a/src/lib/krb5/krb/get_creds.c b/src/lib/krb5/krb/get_creds.c
index dcce7ed085..afa34c2d8c 100644
--- a/src/lib/krb5/krb/get_creds.c
+++ b/src/lib/krb5/krb/get_creds.c
@@ -417,8 +417,6 @@ seen_realm_before(krb5_context context, krb5_tkt_creds_context ctx,
 static krb5_error_code
 complete(krb5_context context, krb5_tkt_creds_context ctx)
 {
-    krb5_error_code code;
-
     TRACE_TKT_CREDS_COMPLETE(context, ctx->reply_creds->server);
 
     /* Note the authdata we asked for in the output creds. */
diff --git a/src/lib/krb5/krb/gic_pwd.c b/src/lib/krb5/krb/gic_pwd.c
index 1fdc814d22..f76f5be00d 100644
--- a/src/lib/krb5/krb/gic_pwd.c
+++ b/src/lib/krb5/krb/gic_pwd.c
@@ -62,7 +62,7 @@ krb5_get_as_key_password(krb5_context context,
             return(ret);
     }
 
-    if ((salt->length == -1 || salt->length == SALT_TYPE_AFS_LENGTH) && (salt->data == NULL)) {
+    if (salt->length == SALT_TYPE_AFS_LENGTH && salt->data == NULL) {
         if ((ret = krb5_principal2salt(context, client, &defsalt)))
             return(ret);
 
diff --git a/src/lib/krb5/krb/ser_actx.c b/src/lib/krb5/krb/ser_actx.c
index 4ac81128aa..b366ff3437 100644
--- a/src/lib/krb5/krb/ser_actx.c
+++ b/src/lib/krb5/krb/ser_actx.c
@@ -230,7 +230,7 @@ krb5_auth_context_externalize(krb5_context kcontext, krb5_pointer arg, krb5_octe
 
             /* Convert to signed 32 bit integer */
             obuf32 = obuf;
-            if (kret == 0 && obuf != obuf32)
+            if (kret == 0 && obuf > KRB5_INT32_MAX)
                 kret = EINVAL;
             if (!kret)
                 (void) krb5_ser_pack_int32(obuf32, &bp, &remain);