diff options
Diffstat (limited to 'crypto/heimdal/kdc/config.c')
-rw-r--r-- | crypto/heimdal/kdc/config.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/crypto/heimdal/kdc/config.c b/crypto/heimdal/kdc/config.c index 0621db1..78f75d3 100644 --- a/crypto/heimdal/kdc/config.c +++ b/crypto/heimdal/kdc/config.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997-2000 Kungliga Tekniska Högskolan + * Copyright (c) 1997-2001 Kungliga Tekniska Högskolan * (Royal Institute of Technology, Stockholm, Sweden). * All rights reserved. * @@ -35,7 +35,7 @@ #include <getarg.h> #include <parse_bytes.h> -RCSID("$Id: config.c,v 1.33 2000/09/10 19:27:17 joda Exp $"); +RCSID("$Id: config.c,v 1.36 2001/05/17 07:13:43 joda Exp $"); static char *config_file; /* location of kdc config file */ @@ -250,7 +250,7 @@ configure(int argc, char **argv) if(config_file == NULL) config_file = _PATH_KDC_CONF; - if(krb5_config_parse_file(config_file, &cf)) + if(krb5_config_parse_file(context, config_file, &cf)) cf = NULL; get_dbinfo(cf); @@ -286,6 +286,7 @@ configure(int argc, char **argv) for (i = 0; i < addresses_str.num_strings; ++i) add_one_address (addresses_str.strings[i], i == 0); + free_getarg_strings (&addresses_str); } else { char **foo = krb5_config_get_strings (context, cf, "kdc", "addresses", NULL); @@ -310,11 +311,11 @@ configure(int argc, char **argv) enable_http = krb5_config_get_bool(context, cf, "kdc", "enable-http", NULL); check_ticket_addresses = - krb5_config_get_bool(context, cf, "kdc", - "check-ticket-addresses", NULL); + krb5_config_get_bool_default(context, cf, TRUE, "kdc", + "check-ticket-addresses", NULL); allow_null_ticket_addresses = - krb5_config_get_bool(context, cf, "kdc", - "allow-null-ticket-addresses", NULL); + krb5_config_get_bool_default(context, cf, TRUE, "kdc", + "allow-null-ticket-addresses", NULL); allow_anonymous = krb5_config_get_bool(context, cf, "kdc", |