svn rev #24542: branches/krb5-1-9/src/slave/

[tlyu@MIT.EDU]

http://src.mit.edu/fisheye/changelog/krb5/?cs=24542
Commit By: tlyu
Log Message:
ticket: 6820
version_fixed: 1.9
status: resolved

pull up r24519 from trunk

 ------------------------------------------------------------------------
 r24519 | ghudson | 2010-11-15 21:54:26 -0500 (Mon, 15 Nov 2010) | 8 lines

 ticket: 6820
 subject: Read KDC profile settings in kpropd
 target_version: 1.9
 tags: pullup

 kpropd can modify the KDB with ulog_replay(), so it should read the
 KDC profile settings in case the KDB configuration is in there.


Changed Files:
U   branches/krb5-1-9/src/slave/kpropd.c
Modified: branches/krb5-1-9/src/slave/kpropd.c
===================================================================
--- branches/krb5-1-9/src/slave/kpropd.c	2010-12-01 02:15:55 UTC (rev 24541)
+++ branches/krb5-1-9/src/slave/kpropd.c	2010-12-01 02:16:04 UTC (rev 24542)
@@ -1034,7 +1034,9 @@
 
     (void) memset(&params, 0, sizeof (params));
 
-    retval = kadm5_init_krb5_context(&kpropd_context);
+    /* Since we may modify the KDB with ulog_replay(), we must read the KDC
+     * profile. */
+    retval = krb5int_init_context_kdc(&kpropd_context);
     if (retval) {
         com_err(argv[0], retval, "while initializing krb5");
         exit(1);