From: Greg Hudson <ghudson@mit.edu>
Date: Thu, 23 Jan 2020 19:49:24 +0000 (-0500)
Subject: Further simplify test KDB module authdata code
X-Git-Tag: krb5-1.19-beta1~127
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d035dc269e80b58cb73fd2b644b06bc5fb53e9cb;p=thirdparty%2Fkrb5.git

Further simplify test KDB module authdata code

Commit 94f7c9705879500b1dc8dda8592490efce05688f simplified the
generation of authdata elements, but left behind some unnecessary
conditionalization when assembling the elements into a list, causing a
Coverity defect.  Further simplify the code.

ticket: 8868
---

diff --git a/src/plugins/kdb/test/kdb_test.c b/src/plugins/kdb/test/kdb_test.c
index d5b9158d06..4f8ea78644 100644
--- a/src/plugins/kdb/test/kdb_test.c
+++ b/src/plugins/kdb/test/kdb_test.c
@@ -910,20 +910,22 @@ test_sign_authdata(krb5_context context, unsigned int flags,
     krb5_data **inds, d;
     int i, val;
 
+    /* Possibly create a PAC authdata element. */
     generate_pac(context, flags, client_princ, server_princ, client,
                  header_server, local_tgt, server_key, header_key,
                  local_tgt_key, authtime, ad_info, &pac_ad);
 
-    /* Add our TEST_AD_TYPE authdata */
+    /* Always create a TEST_AD_TYPE element. */
     test_ad = ealloc(sizeof(*test_ad));
     test_ad->magic = KV5M_AUTHDATA;
     test_ad->ad_type = TEST_AD_TYPE;
     test_ad->contents = (uint8_t *)estrdup("db-authdata-test");
     test_ad->length = strlen((char *)test_ad->contents);
 
+    /* Assemble the authdata into a one-element or two-element list. */
     list = ealloc(3 * sizeof(*list));
-    list[0] = (test_ad != NULL) ? test_ad : pac_ad;
-    list[1] = (test_ad != NULL) ? pac_ad : NULL;
+    list[0] = test_ad;
+    list[1] = pac_ad;
     list[2] = NULL;
     *signed_auth_data = list;