From b14f9b1ac0a214b6c9393c956341a33a5bbe7b93 Mon Sep 17 00:00:00 2001
From: Nicolas Williams <nico@twosigma.com>
Date: Tue, 15 Feb 2022 16:55:29 -0600
Subject: [PATCH] kadm5: Tolerate missing default principal

---
 lib/kadm5/create_s.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/lib/kadm5/create_s.c b/lib/kadm5/create_s.c
index 1c2ab15f3..e603497ac 100644
--- a/lib/kadm5/create_s.c
+++ b/lib/kadm5/create_s.c
@@ -50,6 +50,14 @@ get_default(kadm5_server_context *context, krb5_principal princ,
     ret = kadm5_s_get_principal(context, def_principal, def,
 				KADM5_PRINCIPAL_NORMAL_MASK);
     krb5_free_principal (context->context, def_principal);
+
+    if (ret) {
+        /* Copy defaults from kadmin/init.c */
+        memset(def, 0, sizeof(*def));
+        def->max_life = 24 * 60 * 60;
+        def->max_renewable_life = 7 * def->max_life;
+        def->attributes = KRB5_KDB_DISALLOW_ALL_TIX;
+    }
     return ret;
 }