svn rev #24199: branches/krb5-1-8/src/kadmin/dbutil/

[tlyu@MIT.EDU]

http://src.mit.edu/fisheye/changelog/krb5/?cs=24199
Commit By: tlyu
Log Message:
ticket: 6345
version_fixed: 1.8.3
status: resolved

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.


Changed Files:
U   branches/krb5-1-8/src/kadmin/dbutil/kdb5_stash.c
Modified: branches/krb5-1-8/src/kadmin/dbutil/kdb5_stash.c
===================================================================
--- branches/krb5-1-8/src/kadmin/dbutil/kdb5_stash.c	2010-07-20 22:28:51 UTC (rev 24198)
+++ branches/krb5-1-8/src/kadmin/dbutil/kdb5_stash.c	2010-07-21 17:55:42 UTC (rev 24199)
@@ -135,7 +135,7 @@
     }
 
     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);