Fix minor static analysis defects

Remove an unused variable in krb5_ldap_create().  Handle the return
value from krb5_dbe_get_string() in the certauth test plugin module.
Handle the return value from k5_expand_path_tokens() in
k5_rc_default().  Remove dead assignments in
krb5_get_credentials_for_user() and kg_accept_krb5().

[ghudson@mit.edu: squashed and edited commit message; simplified
k5_rc_default() change]

diff --git a/src/lib/gssapi/krb5/accept_sec_context.c b/src/lib/gssapi/krb5/accept_sec_context.c
index 85be82e9e6ac144ce25b136646f86d86cde3f0c6..636ee303f6fbcca758c6a0debffabaa13bddaef7 100644 (file)
--- a/src/lib/gssapi/krb5/accept_sec_context.c
+++ b/src/lib/gssapi/krb5/accept_sec_context.c
@@ -671,7 +671,7 @@ kg_accept_krb5(minor_status, context_handle,
     krb5_auth_context auth_context = NULL;
     krb5_ticket * ticket = NULL;
     const gss_OID_desc *mech_used = NULL;
-    OM_uint32 major_status = GSS_S_FAILURE;
+    OM_uint32 major_status;
     OM_uint32 tmp_minor_status;
     krb5_error krb_error_data;
     krb5_data scratch;
@@ -878,8 +878,6 @@ kg_accept_krb5(minor_status, context_handle,
     if (major_status != GSS_S_COMPLETE)
         goto fail;
 
-    major_status = GSS_S_FAILURE;
-
     if (exts->iakerb.conv && !exts->iakerb.verified) {
         major_status = GSS_S_BAD_SIG;
         goto fail;

diff --git a/src/lib/krb5/krb/s4u_creds.c b/src/lib/krb5/krb/s4u_creds.c
index 73b59ffa847ff12824cd5dd165b9e9eb9318d7d2..b4481101bc708bb82365c76d96ffcfe3de780393 100644 (file)
--- a/src/lib/krb5/krb/s4u_creds.c
+++ b/src/lib/krb5/krb/s4u_creds.c
@@ -713,7 +713,6 @@ krb5_get_credentials_for_user(krb5_context context, krb5_flags options,
         } else if (code != KRB5_CC_NOTFOUND && code != KRB5_CC_NOT_KTYPE) {
             goto cleanup;
         }
-        code = 0;
     }
 
     /* Note the authdata we asked for in the output creds. */

diff --git a/src/lib/krb5/rcache/rc_base.c b/src/lib/krb5/rcache/rc_base.c
index 5f456d1f3304f2b7b7bf9cd87b3aed654c541032..f9a4823183c590efed8b2705ff666fe092b6e21b 100644 (file)
--- a/src/lib/krb5/rcache/rc_base.c
+++ b/src/lib/krb5/rcache/rc_base.c
@@ -56,6 +56,8 @@ k5_rc_default(krb5_context context, krb5_rcache *rc_out)
                            &profstr) == 0 && profstr != NULL) {
         ret = k5_expand_path_tokens(context, profstr, &rcname);
         profile_release_string(profstr);
+        if (ret)
+            return ret;
         ret = k5_rc_resolve(context, rcname, rc_out);
         free(rcname);
         return ret;

diff --git a/src/plugins/certauth/test/main.c b/src/plugins/certauth/test/main.c
index d4633b8cd155f1cd3dcb8beb753cb1ebe8190106..7e7a3ef4c61951eb77a70798155167b6bd0a0d27 100644 (file)
--- a/src/plugins/certauth/test/main.c
+++ b/src/plugins/certauth/test/main.c
@@ -171,6 +171,9 @@ test2_authorize(krb5_context context, krb5_certauth_moddata moddata,
 
     ret = krb5_dbe_get_string(context, (krb5_db_entry *)db_entry, "hwauth",
                               &strval);
+    if (ret)
+        goto cleanup;
+
     ret = (strval != NULL) ? KRB5_CERTAUTH_HWAUTH : 0;
     krb5_dbe_free_string(context, strval);
 

diff --git a/src/plugins/kdb/ldap/libkdb_ldap/ldap_create.c b/src/plugins/kdb/ldap/libkdb_ldap/ldap_create.c
index 5b57c799a72e2881c3701e6d107a6276605149a5..2d6605666a56001803102c31824546548a4f9666 100644 (file)
--- a/src/plugins/kdb/ldap/libkdb_ldap/ldap_create.c
+++ b/src/plugins/kdb/ldap/libkdb_ldap/ldap_create.c
@@ -55,7 +55,6 @@ krb5_ldap_create(krb5_context context, char *conf_section, char **db_args)
     krb5_error_code status = 0;
     krb5_ldap_realm_params *rparams = NULL;
     krb5_ldap_context *ldap_context=NULL;
-    krb5_boolean realm_obj_created = FALSE;
     int mask = 0;
 
     /* Clear the global error string */
@@ -109,9 +108,6 @@ krb5_ldap_create(krb5_context context, char *conf_section, char **db_args)
     if ((status = krb5_ldap_create_realm(context, rparams, mask)))
         goto cleanup;
 
-    /* We just created the Realm container. Here starts our transaction tracking */
-    realm_obj_created = TRUE;
-
     /* verify realm object */
     if ((status = krb5_ldap_read_realm_params(context,
                                               rparams->realm_name,