diff options
| author | Ken Raeburn <raeburn@mit.edu> | 2008-08-06 16:47:37 +0000 |
|---|---|---|
| committer | Ken Raeburn <raeburn@mit.edu> | 2008-08-06 16:47:37 +0000 |
| commit | e2a4b911251af9dc2674c74992564a646e7baab0 (patch) | |
| tree | 584d76cb6e6d5d15a2cfd888072aa30618c41eb0 /src | |
| parent | 87d1e9d1950b3fa4544c93056ada9fef00e1b7c3 (diff) | |
| download | krb5-e2a4b911251af9dc2674c74992564a646e7baab0.tar.gz krb5-e2a4b911251af9dc2674c74992564a646e7baab0.tar.xz krb5-e2a4b911251af9dc2674c74992564a646e7baab0.zip | |
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
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/kdb/kdb5.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/kdb/kdb5.c b/src/lib/kdb/kdb5.c index f6e506a6e..f25864dc7 100644 --- 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); |