From: Greg Hudson <ghudson@mit.edu>
Date: Mon, 21 Jun 2010 19:56:29 +0000 (+0000)
Subject: kdb5_stash() contains its own kdb5_db_open() call (because it doesn't
X-Git-Tag: krb5-1.9-beta1~186
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=458cd45984e33ee19ce045d13c2a250ec55c87d7;p=krb5.git

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
target_version: 1.8.3
tags: pullup

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@24141 dc483132-0cff-0310-8789-dd5450dbe970
---

diff --git a/src/kadmin/dbutil/kdb5_stash.c b/src/kadmin/dbutil/kdb5_stash.c
index b639cd159..422a3fbb0 100644
--- a/src/kadmin/dbutil/kdb5_stash.c
+++ b/src/kadmin/dbutil/kdb5_stash.c
@@ -136,7 +136,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);