Rewrite conditional test for update log processing to make static analysis simpler

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

diff --git a/src/lib/kdb/kdb5.c b/src/lib/kdb/kdb5.c
index f6e506a6e0a6f3d51cad7ddad0bd21192936dcdb..f25864dc71aaf3176cd370d36c5eca1c4ea328ed 100644 (file)
--- a/src/lib/kdb/kdb5.c
+++ b/src/lib/kdb/kdb5.c
@@ -1047,7 +1047,7 @@ krb5_db_put_principal(krb5_context kcontext,
     krb5_error_code status = 0;
     kdb5_dal_handle *dal_handle;
     char  **db_args = NULL;
-    kdb_incr_update_t *upd, *fupd;
+    kdb_incr_update_t *upd, *fupd = 0;
     char *princ_name = NULL;
     kdb_log_context *log_ctx;
     int i;
@@ -1101,7 +1101,7 @@ krb5_db_put_principal(krb5_context kcontext,
        /*
         * We'll be sharing the same locks as db for logging
         */
-        if (log_ctx && (log_ctx->iproprole == IPROP_MASTER)) {
+        if (fupd) {
                if ((status = krb5_unparse_name(kcontext, entries->princ,
                    &princ_name)))
                        goto err_lock;
@@ -1111,15 +1111,15 @@ krb5_db_put_principal(krb5_context kcontext,
 
                 if (status = ulog_add_update(kcontext, upd))
                        goto err_lock;
+               upd++;
         }
-       upd++;
     }
 
     status = dal_handle->lib_handle->vftabl.db_put_principal(kcontext, entries,
                                                             nentries,
                                                             db_args);
     get_errmsg(kcontext, status);
-    if (status == 0 && log_ctx && log_ctx->iproprole == IPROP_MASTER) {
+    if (status == 0 && fupd) {
        upd = fupd;
        for (i = 0; i < *nentries; i++) {
            (void) ulog_finish_update(kcontext, upd);