[29087] in CVS-changelog-for-Kerberos-V5
krb5 commit: Set plugin_base_dir for kadmin tests
daemon@ATHENA.MIT.EDU (Greg Hudson)
Fri Oct 2 16:19:42 2015
Date: Fri, 2 Oct 2015 16:19:38 -0400
From: Greg Hudson <ghudson@mit.edu>
Message-Id: <201510022019.t92KJc6F031620@drugstore.mit.edu>
To: cvs-krb5@mit.edu
Reply-To: krbdev@mit.edu
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: cvs-krb5-bounces@mit.edu
https://github.com/krb5/krb5/commit/3db59d81bbbe389553d13efeee1c99117b459b24
commit 3db59d81bbbe389553d13efeee1c99117b459b24
Author: Nalin Dahyabhai <nalin@redhat.com>
Date: Thu Oct 1 18:59:34 2015 -0400
Set plugin_base_dir for kadmin tests
In the krb5.conf used by the kadmin tests, include a plugin_base_dir
setting. Otherwise the KDC can load and run code from kdcpreauth
modules in the install tree.
[ghudson@mit.edu: commit message]
ticket: 8262 (new)
target_version: 1.14
tags: pullup
src/kadmin/testing/proto/krb5.conf.proto | 1 +
src/kadmin/testing/scripts/start_servers | 1 +
2 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/src/kadmin/testing/proto/krb5.conf.proto b/src/kadmin/testing/proto/krb5.conf.proto
index c2648d6..e9702bb 100644
--- a/src/kadmin/testing/proto/krb5.conf.proto
+++ b/src/kadmin/testing/proto/krb5.conf.proto
@@ -2,6 +2,7 @@
default_realm = __REALM__
default_keytab_name = FILE:__K5ROOT__/v5srvtab
dns_fallback = no
+ plugin_base_dir = __PLUGIN_DIR__
[realms]
__REALM__ = {
diff --git a/src/kadmin/testing/scripts/start_servers b/src/kadmin/testing/scripts/start_servers
index f328618..87bd52f 100755
--- a/src/kadmin/testing/scripts/start_servers
+++ b/src/kadmin/testing/scripts/start_servers
@@ -40,6 +40,7 @@ if [ $local = 0 ]; then
-e "s/__KDCHOST__/$hostname/g" \
-e "s/__LOCALHOST__/$localname/g" \
-e "s#__MODDIR__#$TOP/../plugins/kdb#g"\
+ -e "s#__PLUGIN_DIR__#$TOP/../plugins#g"\
< $STESTDIR/proto/krb5.conf.proto > $K5ROOT/krb5.conf
# Using /usr/ucb/rsh and getting rid of "-k $REALM" until we get
_______________________________________________
cvs-krb5 mailing list
cvs-krb5@mit.edu
https://mailman.mit.edu/mailman/listinfo/cvs-krb5
