From: Tom Yu <tlyu@mit.edu>
Date: Sat, 2 Aug 2014 18:20:35 +0000 (-0400)
Subject: Ignore iprop deletion of deleted princ
X-Git-Tag: krb5-1.13-alpha1~23
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8f752f88bf1b1284d8e2b8119031625f2b703ab7;p=thirdparty%2Fkrb5.git

Ignore iprop deletion of deleted princ

Now that an iprop full dump might not hold a lock around the entire
dump, it's possible that iprop will queue an incremental update while
the dump is in progress.  If a principal is deleted while the dump is
in progress, the dump could omit that principal, yet the deletion
event would still be queued in the ulog.  Ignore that deletion without
generating an error.

This is the same basic change as for ticket #7753.

ticket: 7977
---

diff --git a/src/lib/kdb/kdb_log.c b/src/lib/kdb/kdb_log.c
index 1a5b1b80f0..faca467fcf 100644
--- a/src/lib/kdb/kdb_log.c
+++ b/src/lib/kdb/kdb_log.c
@@ -382,6 +382,8 @@ ulog_replay(krb5_context context, kdb_incr_result_t *incr_ret, char **db_args)
 
             retval = krb5int_delete_principal_no_log(context, dbprinc);
             krb5_free_principal(context, dbprinc);
+            if (retval == KRB5_KDB_NOENTRY)
+                retval = 0;
             if (retval)
                 goto cleanup;
         } else {