[src/netbsd-1-5]: src/crypto/dist/heimdal/kdc Pull up revisions 1.3-1.4 (via ...

[he <he%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/4944788cea8c
branches:  netbsd-1-5
changeset: 491182:4944788cea8c
user:      he <he%NetBSD.org@localhost>
date:      Thu Apr 05 23:32:07 2001 +0000

description:
Pull up revisions 1.3-1.4 (via patch, requested by assar):
  Upgrade Heimdal to version 0.3e.

diffstat:

 crypto/dist/heimdal/kdc/config.c |  21 +++++++++++++++++++--
 1 files changed, 19 insertions(+), 2 deletions(-)

diffs (59 lines):

diff -r 175534b619d1 -r 4944788cea8c crypto/dist/heimdal/kdc/config.c
--- a/crypto/dist/heimdal/kdc/config.c  Thu Apr 05 23:31:45 2001 +0000
+++ b/crypto/dist/heimdal/kdc/config.c  Thu Apr 05 23:32:07 2001 +0000
@@ -35,7 +35,7 @@
 #include <getarg.h>
 #include <parse_bytes.h>
 
-RCSID("$Id: config.c,v 1.1.1.1.2.1 2000/08/06 21:11:07 thorpej Exp $");
+RCSID("$Id: config.c,v 1.1.1.1.2.2 2001/04/05 23:32:07 he Exp $");
 
 static char *config_file;      /* location of kdc config file */
 
@@ -66,6 +66,8 @@
 
 #ifdef KRB4
 char *v4_realm;
+int enable_v4 = -1;
+int enable_524 = -1;
 #endif
 #ifdef KASERVER
 krb5_boolean enable_kaserver = -1;
@@ -96,6 +98,12 @@
     { "enable-http", 'H', arg_flag, &enable_http, "turn on HTTP support" },
     { "no-detach",   'D', arg_flag, &no_detach, "do not detach from tty" },
 #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"
@@ -242,7 +250,7 @@
        usage(1);
     
     if(config_file == NULL)
-       config_file = HDB_DB_DIR "/kdc.conf";
+       config_file = _PATH_KDC_CONF;
     
     if(krb5_config_parse_file(config_file, &cf))
        cf = NULL;
@@ -291,6 +299,15 @@
        }
     }
 
+#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);