summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@jelmer.uk>2017-01-07 16:51:15 +0000
committerJelmer Vernooij <jelmer@jelmer.uk>2017-01-07 16:51:15 +0000
commit88813a7ccb8c78ab4c0f0056e21a51a159b60bb7 (patch)
tree6f8a0ef10b1492386748454aed0570022a0105f9
parent6a49f3e786a06522cce6ec13481985247beec33c (diff)
Also exclude KDC call to hdb_dbinfo_get_label.
-rw-r--r--debian/patches/no_test_dbinfo13
-rw-r--r--kdc/set_dbinfo.c2
2 files changed, 13 insertions, 2 deletions
diff --git a/debian/patches/no_test_dbinfo b/debian/patches/no_test_dbinfo
index 5269115e9..be97dbd08 100644
--- a/debian/patches/no_test_dbinfo
+++ b/debian/patches/no_test_dbinfo
@@ -28,3 +28,16 @@ index f54940d23..f4a408a4c 100644
test_mkey$(EXEEXT) test_hdbplugin$(EXEEXT)
subdir = lib/hdb
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+diff --git a/kdc/set_dbinfo.c b/kdc/set_dbinfo.c
+index d22e083f7..f49aaa163 100644
+--- a/kdc/set_dbinfo.c
++++ b/kdc/set_dbinfo.c
+@@ -85,8 +85,6 @@ krb5_kdc_set_dbinfo(krb5_context context, struct krb5_kdc_configuration *c)
+ if (ret)
+ goto out;
+
+- kdc_log(context, c, 0, "label: %s",
+- hdb_dbinfo_get_label(context, d));
+ kdc_log(context, c, 0, "\tdbname: %s",
+ hdb_dbinfo_get_dbname(context, d));
+ kdc_log(context, c, 0, "\tmkey_file: %s",
diff --git a/kdc/set_dbinfo.c b/kdc/set_dbinfo.c
index d22e083f7..f49aaa163 100644
--- a/kdc/set_dbinfo.c
+++ b/kdc/set_dbinfo.c
@@ -85,8 +85,6 @@ krb5_kdc_set_dbinfo(krb5_context context, struct krb5_kdc_configuration *c)
if (ret)
goto out;
- kdc_log(context, c, 0, "label: %s",
- hdb_dbinfo_get_label(context, d));
kdc_log(context, c, 0, "\tdbname: %s",
hdb_dbinfo_get_dbname(context, d));
kdc_log(context, c, 0, "\tmkey_file: %s",