diff options
| author | Tom Yu <tlyu@mit.edu> | 2007-04-10 21:51:46 +0000 |
|---|---|---|
| committer | Tom Yu <tlyu@mit.edu> | 2007-04-10 21:51:46 +0000 |
| commit | ebd2bf7c71d836b443a293aa255bc1761d8b8685 (patch) | |
| tree | 0115cb1851e0386ab2bc6c64c268c4f1ad0dd68a /src | |
| parent | 40a9e4c54e163bcd199925524ad0dcaf3b2c8d45 (diff) | |
| download | krb5-ebd2bf7c71d836b443a293aa255bc1761d8b8685.zip krb5-ebd2bf7c71d836b443a293aa255bc1761d8b8685.tar.gz krb5-ebd2bf7c71d836b443a293aa255bc1761d8b8685.tar.bz2 | |
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
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/krb5/os/init_os_ctx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/krb5/os/init_os_ctx.c b/src/lib/krb5/os/init_os_ctx.c index b3d8dcf..88b5ed0 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) { |