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

diff --git a/src/kadmin/testing/proto/krb5.conf.proto b/src/kadmin/testing/proto/krb5.conf.proto
index c2648d6c67e7ef9bc06284a08491038990ca233e..e9702bb86f354f8d8444b7c114f8b779aa07d68f 100644 (file)
--- 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 f32861884d50658a568d11d75c303e5bee99c1a1..87bd52fc0ba6890d5a3c3fd7545aaa08f15d987f 100755 (executable)
--- 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