From: Tom Yu <tlyu@mit.edu>
Date: Tue, 10 Apr 2007 21:51:46 +0000 (+0000)
Subject: pull up r19239 from trunk
X-Git-Tag: krb5-1.6.1-beta1~15
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ebd2bf7c71d836b443a293aa255bc1761d8b8685;p=krb5.git

pull up r19239 from trunk

 r19239@cathode-dark-space:  raeburn | 2007-03-21 00:14:02 -0400
 ticket: new
 subject: krb5 library uses kdc.conf when it shouldn't

 Don't add kdc.conf to the list of config files to use unless it's
 actually requested.  Reported by Will Fiveash.


ticket: 5480
version_fixed: 1.6.1

git-svn-id: svn://anonsvn.mit.edu/krb5/branches/krb5-1-6@19415 dc483132-0cff-0310-8789-dd5450dbe970
---

diff --git a/src/lib/krb5/os/init_os_ctx.c b/src/lib/krb5/os/init_os_ctx.c
index b3d8dcf8c..88b5ed044 100644
--- a/src/lib/krb5/os/init_os_ctx.c
+++ b/src/lib/krb5/os/init_os_ctx.c
@@ -336,7 +336,7 @@ os_init_paths(krb5_context ctx, krb5_boolean kdc)
 
     retval = os_get_default_config_files(&files, secure);
 
-    if (retval == 0)
+    if (retval == 0 && kdc)
 	retval = add_kdc_config_file(&files);
 
     if (!retval) {