krb5 commit: Set plugin_base_dir for kadmin tests

[Greg Hudson]

https://github.com/krb5/krb5/commit/3db59d81bbbe389553d13efeee1c99117b459b24
commit 3db59d81bbbe389553d13efeee1c99117b459b24
Author: Nalin Dahyabhai <nalin at 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 at 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