add options to enable/disable v4 and 524 requests

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@8340 ec53bebd-3082-4978-b11e-865c3cabbd6b

diff --git a/kdc/config.c b/kdc/config.c
index ff31603430f97a748edcb4fc60820aa7d20a4c46..fc0aba0a86ff812c7fc32d7681cc1a190000502c 100644 (file)
--- a/kdc/config.c
+++ b/kdc/config.c
@@ -65,6 +65,8 @@ krb5_addresses explicit_addresses;
 
 #ifdef KRB4
 char *v4_realm;
+int enable_v4 = -1;
+int enable_524 = -1;
 #endif
 #ifdef KASERVER
 krb5_boolean enable_kaserver = -1;
@@ -94,6 +96,12 @@ static struct getargs args[] = {
 #endif
     { "enable-http", 'H', arg_flag, &enable_http, "turn on HTTP support" },
 #ifdef KRB4
+    {  "kerberos4",    0,      arg_negative_flag, &enable_v4,
+       "don't respond to kerberos 4 requests" 
+    },
+    {  "524",          0,      arg_negative_flag, &enable_524,
+       "don't respond to 524 requests" 
+    },
     { 
        "v4-realm",     'r',    arg_string, &v4_realm, 
        "realm to serve v4-requests for"
@@ -289,6 +297,15 @@ configure(int argc, char **argv)
        }
     }
 
+#ifdef KRB4
+    if(enable_v4 == -1)
+       enable_v4 = krb5_config_get_bool_default(context, cf, TRUE, "kdc", 
+                                        "enable-kerberos4", NULL);
+    if(enable_524 == -1)
+       enable_524 = krb5_config_get_bool_default(context, cf, enable_v4, 
+                                                 "kdc", "enable-524", NULL);
+#endif
+
     if(enable_http == -1)
        enable_http = krb5_config_get_bool(context, cf, "kdc", 
                                           "enable-http", NULL);

diff --git a/kdc/kdc_locl.h b/kdc/kdc_locl.h
index 10b2a23139b8d6061fd8a8f6515fd18e72cc5fab..e0520c84e5df050aa6efb16e1ef00f51f76ff689 100644 (file)
--- a/kdc/kdc_locl.h
+++ b/kdc/kdc_locl.h
@@ -65,6 +65,8 @@ extern krb5_boolean allow_anonymous;
 
 #ifdef KRB4
 extern char *v4_realm;
+extern int enable_v4;
+extern int enable_524;
 #endif
 #ifdef KASERVER
 extern krb5_boolean enable_kaserver;