krb5 commit: Ignore iprop deletion of deleted princ

Tom Yu tlyu at MIT.EDU
Sat Aug 2 14:24:29 EDT 2014


https://github.com/krb5/krb5/commit/8f752f88bf1b1284d8e2b8119031625f2b703ab7
commit 8f752f88bf1b1284d8e2b8119031625f2b703ab7
Author: Tom Yu <tlyu at mit.edu>
Date:   Sat Aug 2 14:20:35 2014 -0400

    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

 src/lib/kdb/kdb_log.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/src/lib/kdb/kdb_log.c b/src/lib/kdb/kdb_log.c
index 1a5b1b8..faca467 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 {


More information about the cvs-krb5 mailing list