From: sashan <anedvedicky@gmail.com>
Date: Wed, 18 Apr 2018 20:40:33 +0000 (+0200)
Subject: Improve error for kadmind -proponly without iprop
X-Git-Tag: krb5-1.17-beta1~134
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F764%2Fhead;p=thirdparty%2Fkrb5.git

Improve error for kadmind -proponly without iprop

If kadmind is run with the -proponly flag, check that iprop_enable is
set and output a reasonable error message if it isn't.  Otherwise we
see the confusing message "Invalid argument while initializing
network".

[ghudson@mit.edu: rewrote commit message; edited error message]

ticket: 8673 (new)
---

diff --git a/src/kadmin/server/ovsec_kadmd.c b/src/kadmin/server/ovsec_kadmd.c
index 3d578ca392..6a6b21401e 100644
--- a/src/kadmin/server/ovsec_kadmd.c
+++ b/src/kadmin/server/ovsec_kadmd.c
@@ -468,6 +468,10 @@ main(int argc, char *argv[])
         fail_to_start(0, _("Missing required realm configuration"));
     if (!(params.mask & KADM5_CONFIG_ACL_FILE))
         fail_to_start(0, _("Missing required ACL file configuration"));
+    if (proponly && !params.iprop_enabled) {
+        fail_to_start(0, _("-proponly can only be used when "
+                           "iprop_enable is true"));
+    }
 
     ret = setup_loop(&params, proponly, &vctx);
     if (ret)