From a5271cd765f5c6ca669ab1188152eaac4f4958bd Mon Sep 17 00:00:00 2001
From: Nicolas Williams <nico@twosigma.com>
Date: Mon, 25 Apr 2022 17:41:40 -0500
Subject: [PATCH] httpkadmind: Enable materialization

---
 kdc/httpkadmind.c              | 4 ----
 tests/kdc/check-httpkadmind.in | 2 --
 2 files changed, 6 deletions(-)

diff --git a/kdc/httpkadmind.c b/kdc/httpkadmind.c
index a625f37e0..01c6676e2 100644
--- a/kdc/httpkadmind.c
+++ b/kdc/httpkadmind.c
@@ -1423,9 +1423,6 @@ get_keys1(kadmin_request_desc r, const char *pname)
     } else if (ret == 0 && r->materialize &&
                (princ.attributes & KRB5_KDB_VIRTUAL)) {
 
-#ifndef MATERIALIZE_NOTYET
-        ret = ENOTSUP;
-#else
         if (read_only)
             ret = KADM5_READ_ONLY;
         else
@@ -1454,7 +1451,6 @@ get_keys1(kadmin_request_desc r, const char *pname)
         if (ret == 0)
             ret = kadm5_create_principal(r->kadm_handle, &princ, mask, "");
         refetch = 1;
-#endif
     } /* else create/materialize q-params are superfluous */
 
     /* Handle rotate / revoke options */
diff --git a/tests/kdc/check-httpkadmind.in b/tests/kdc/check-httpkadmind.in
index 063ccdf4d..b35e2837c 100644
--- a/tests/kdc/check-httpkadmind.in
+++ b/tests/kdc/check-httpkadmind.in
@@ -437,7 +437,6 @@ ${ktutil} -k "${objdir}/extracted_keytab" list --keys > extracted_keytab.kadmin
 cmp extracted_keytab.kadmin extracted_keytab.rest ||
     { echo "Keytabs for $p don't match!"; exit 1; }
 
-if false; then
 hn=bar.ns.${domain}
 p=HTTP/$hn
 echo "Checking materialization of virtual principal ($p)"
@@ -456,7 +455,6 @@ ${ktutil} -k "${objdir}/extracted_keytab" list --keys > extracted_keytab.kadmin
     { echo "Failed to list keytab for $p"; exit 1; }
 cmp extracted_keytab.kadmin extracted_keytab.rest ||
     { echo "Keytabs for $p don't match!"; exit 1; }
-fi
 
 echo "Starting secondary httpkadmind to test HTTP redirection"
 ${httpkadmind2} --primary-server-uri=http://localhost:$restport         \