From 48b14852038e9bb3e379d78b5aab84ead6a4f396 Mon Sep 17 00:00:00 2001 From: Tom Yu Date: Wed, 1 Dec 2010 02:16:04 +0000 Subject: [PATCH] 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. ticket: 6820 version_fixed: 1.9 status: resolved git-svn-id: svn://anonsvn.mit.edu/krb5/branches/krb5-1-9@24542 dc483132-0cff-0310-8789-dd5450dbe970 --- src/slave/kpropd.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/slave/kpropd.c b/src/slave/kpropd.c index a46009aed..261dda383 100644 --- a/src/slave/kpropd.c +++ b/src/slave/kpropd.c @@ -1034,7 +1034,9 @@ void PRS(argv) (void) memset(¶ms, 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); -- 2.26.2