oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

httpkadmind: Enable materialization

Browse Source
This commit is contained in:
Nicolas Williams
2022-04-25 17:41:40 -05:00
parent 18f44e7e90
commit a5271cd765
2 changed files with 0 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
kdc/httpkadmind.c
View File

@@ -1423,9 +1423,6 @@ get_keys1(kadmin_request_desc r, const char *pname)
} else if (ret == 0 && r->materialize && } else if (ret == 0 && r->materialize &&
(princ.attributes & KRB5_KDB_VIRTUAL)) { (princ.attributes & KRB5_KDB_VIRTUAL)) {
#ifndef MATERIALIZE_NOTYET
ret = ENOTSUP;
#else
if (read_only) if (read_only)
ret = KADM5_READ_ONLY; ret = KADM5_READ_ONLY;
else else
@@ -1454,7 +1451,6 @@ get_keys1(kadmin_request_desc r, const char *pname)
if (ret == 0) if (ret == 0)
ret = kadm5_create_principal(r->kadm_handle, &princ, mask, ""); ret = kadm5_create_principal(r->kadm_handle, &princ, mask, "");
refetch = 1; refetch = 1;
#endif
} /* else create/materialize q-params are superfluous */ } /* else create/materialize q-params are superfluous */
/* Handle rotate / revoke options */ /* Handle rotate / revoke options */

2
tests/kdc/check-httpkadmind.in
View File

@@ -437,7 +437,6 @@ ${ktutil} -k "${objdir}/extracted_keytab" list --keys > extracted_keytab.kadmin
cmp extracted_keytab.kadmin extracted_keytab.rest || cmp extracted_keytab.kadmin extracted_keytab.rest ||
{ echo "Keytabs for $p don't match!"; exit 1; } { echo "Keytabs for $p don't match!"; exit 1; }
if false; then
hn=bar.ns.${domain} hn=bar.ns.${domain}
p=HTTP/$hn p=HTTP/$hn
echo "Checking materialization of virtual principal ($p)" 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; } { echo "Failed to list keytab for $p"; exit 1; }
cmp extracted_keytab.kadmin extracted_keytab.rest || cmp extracted_keytab.kadmin extracted_keytab.rest ||
{ echo "Keytabs for $p don't match!"; exit 1; } { echo "Keytabs for $p don't match!"; exit 1; }
fi
echo "Starting secondary httpkadmind to test HTTP redirection" echo "Starting secondary httpkadmind to test HTTP redirection"
${httpkadmind2} --primary-server-uri=http://localhost:$restport \ ${httpkadmind2} --primary-server-uri=http://localhost:$restport \