From c2cde6766e155d138ac68574866c167850d2e7e5 Mon Sep 17 00:00:00 2001 From: Johan Danielsson Date: Mon, 4 Feb 2002 10:53:48 +0000 Subject: [PATCH] (get_dbinfo): if there are database specifications in the config file, don't automatically try to use the default values (from Gombas Gabor) git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@10819 ec53bebd-3082-4978-b11e-865c3cabbd6b --- kdc/config.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/kdc/config.c b/kdc/config.c index b523bb40e..585f8a81a 100644 --- a/kdc/config.c +++ b/kdc/config.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997-2001 Kungliga Tekniska Högskolan + * Copyright (c) 1997-2002 Kungliga Tekniska Högskolan * (Royal Institute of Technology, Stockholm, Sweden). * All rights reserved. * @@ -181,7 +181,8 @@ get_dbinfo(krb5_config_section *cf) } *dt = di; dt = &di->next; - } else { + } else if(databases == NULL) { + /* if there are none specified, use some default */ di = calloc(1, sizeof(*di)); di->dbname = strdup(default_dbname); di->mkey_file = strdup(default_mkey);