From 2d238b9d15ec4f9c95795a86dc8bc391a40d5b61 Mon Sep 17 00:00:00 2001 From: Nicolas Williams Date: Mon, 12 Aug 2013 11:38:25 -0500 Subject: [PATCH] Backwards interop for older iprop peers Don't abort() when seeing as-yet-unimplemented things we know about. Patch from Harald Barth . --- lib/kadm5/log.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/lib/kadm5/log.c b/lib/kadm5/log.c index 5ace4682d..e31a30e43 100644 --- a/lib/kadm5/log.c +++ b/lib/kadm5/log.c @@ -627,7 +627,7 @@ kadm5_log_replay_modify (kadm5_server_context *context, } } if (mask & KADM5_LAST_PWD_CHANGE) { - abort (); /* XXX */ + krb5_warnx (context->context, "Unimplemented mask KADM5_LAST_PWD_CHANGE"); } if (mask & KADM5_ATTRIBUTES) { ent.entry.flags = log_ent.entry.flags; @@ -667,16 +667,13 @@ kadm5_log_replay_modify (kadm5_server_context *context, ent.entry.kvno = log_ent.entry.kvno; } if (mask & KADM5_MKVNO) { - abort (); /* XXX */ + krb5_warnx (context->context, "Unimplemented mask KADM5_KVNO"); } if (mask & KADM5_AUX_ATTRIBUTES) { - abort (); /* XXX */ - } - if (mask & KADM5_POLICY) { - abort (); /* XXX */ + krb5_warnx (context->context, "Unimplemented mask KADM5_AUX_ATTRIBUTES"); } if (mask & KADM5_POLICY_CLR) { - abort (); /* XXX */ + krb5_warnx (context->context, "Unimplemented mask KADM5_POLICY_CLR"); } if (mask & KADM5_MAX_RLIFE) { if (log_ent.entry.max_renew == NULL) { @@ -694,13 +691,13 @@ kadm5_log_replay_modify (kadm5_server_context *context, } } if (mask & KADM5_LAST_SUCCESS) { - abort (); /* XXX */ + krb5_warnx (context->context, "Unimplemented mask KADM5_LAST_SUCCESS"); } if (mask & KADM5_LAST_FAILED) { - abort (); /* XXX */ + krb5_warnx (context->context, "Unimplemented mask KADM5_LAST_FAILED"); } if (mask & KADM5_FAIL_AUTH_COUNT) { - abort (); /* XXX */ + krb5_warnx (context->context, "Unimplemented mask KADM5_FAIL_AUTH_COUNT"); } if (mask & KADM5_KEY_DATA) { size_t num; -- 2.11.4.GIT