From eff72ca9cdf2a334c956e05b57b510363830e79a Mon Sep 17 00:00:00 2001 From: Tom Yu Date: Wed, 21 Jul 2010 17:55:42 +0000 Subject: pull up r24141 from trunk ------------------------------------------------------------------------ r24141 | ghudson | 2010-06-21 15:56:29 -0400 (Mon, 21 Jun 2010) | 10 lines ticket: 6345 target_version: 1.8.3 tags: pullup kdb5_stash() contains its own kdb5_db_open() call (because it doesn't use util_context for some reason), which didn't work with the LDAP back end because LDAP doesn't recognize KRB5_KDB_SRV_TYPE_OTHER. As a minimal fix, change that to KRB5_KDB_SRV_TYPE_ADMIN to be consistent with open_db_and_mkey()--see also r18736. ticket: 6345 version_fixed: 1.8.3 status: resolved git-svn-id: svn://anonsvn.mit.edu/krb5/branches/krb5-1-8@24199 dc483132-0cff-0310-8789-dd5450dbe970 --- src/kadmin/dbutil/kdb5_stash.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/kadmin/dbutil/kdb5_stash.c b/src/kadmin/dbutil/kdb5_stash.c index c04f006..7326201 100644 --- a/src/kadmin/dbutil/kdb5_stash.c +++ b/src/kadmin/dbutil/kdb5_stash.c @@ -135,7 +135,7 @@ kdb5_stash(argc, argv) } retval = krb5_db_open(context, db5util_db_args, - KRB5_KDB_OPEN_RW | KRB5_KDB_SRV_TYPE_OTHER); + KRB5_KDB_OPEN_RW | KRB5_KDB_SRV_TYPE_ADMIN); if (retval) { com_err(progname, retval, "while initializing the database '%s'", dbname); -- cgit v1.1