svn rev #25436: trunk/src/ config/ kadmin/testing/scripts/ plugins/authdata/greet/ ...
ghudson@MIT.EDU
ghudson at MIT.EDU
Fri Nov 4 14:39:36 EDT 2011
http://src.mit.edu/fisheye/changelog/krb5/?cs=25436
Commit By: ghudson
Log Message:
Get rid of fake-install
Instead, use $(BUILDTOP)/plugins as the plugin base for tests. For
each real plugin module, create a link in the parent directory if
we're doing a shared-library build--so built KDB modules can be found
in plugins/kdb, preauth modules in plugins/preauth, etc..
Changed Files:
U trunk/src/Makefile.in
U trunk/src/aclocal.m4
U trunk/src/config/libnover.in
U trunk/src/config/pre.in
U trunk/src/config/shlib.conf
U trunk/src/kadmin/testing/scripts/env-setup.shin
U trunk/src/kadmin/testing/scripts/init_db
U trunk/src/kadmin/testing/scripts/start_servers
U trunk/src/plugins/authdata/greet/Makefile.in
U trunk/src/plugins/authdata/greet_client/Makefile.in
U trunk/src/plugins/authdata/greet_server/Makefile.in
U trunk/src/plugins/kadm5_hook/test/Makefile.in
U trunk/src/plugins/kdb/db2/Makefile.in
U trunk/src/plugins/kdb/hdb/Makefile.in
U trunk/src/plugins/kdb/ldap/Makefile.in
U trunk/src/plugins/locate/python/Makefile.in
U trunk/src/plugins/preauth/pkinit/Makefile.in
U trunk/src/plugins/preauth/securid_sam2/Makefile.in
U trunk/src/tests/Makefile.in
U trunk/src/tests/dejagnu/Makefile.in
U trunk/src/tests/dejagnu/config/default.exp
U trunk/src/tests/dejagnu/krb-standalone/standalone.exp
U trunk/src/tests/mkeystash_compat/Makefile.in
U trunk/src/util/Makefile.in
U trunk/src/util/k5test.py
Modified: trunk/src/Makefile.in
===================================================================
--- trunk/src/Makefile.in 2011-11-04 17:15:37 UTC (rev 25435)
+++ trunk/src/Makefile.in 2011-11-04 18:39:35 UTC (rev 25436)
@@ -80,27 +80,12 @@
# install::
# $(MAKE) $(MFLAGS) install.man
-fake-install: runenv.py
- $(RM) -r $(FAKEPREFIX)
- @for i in $(INSTALLMKDIRS); do \
- $(srcdir)/config/mkinstalldirs util/fakedest$$i; \
- done
- (w=`pwd`; cd util && $(MAKE) install DESTDIR="$$w/util/fakedest")
- (w=`pwd`; cd lib && $(MAKE) install DESTDIR="$$w/util/fakedest")
- (w=`pwd`; cd plugins/kdb/db2 && $(MAKE) install DESTDIR="$$w/util/fakedest")
- if test -r plugins/preauth/pkinit/Makefile; then \
- (w=`pwd`; cd plugins/preauth/pkinit && $(MAKE) install DESTDIR="$$w/util/fakedest"); \
- fi
-
-# (w=`pwd`; cd plugins/locate/python && $(MAKE) install DESTDIR="$$w/util/fakedest")
-
TAGS: $(SRCS)
etags $(SRCS)
clean-:: clean-windows
clean-unix::
$(RM) *.o core krb5-config
- $(RM) -r util/fakedest
mostlyclean: clean
@@ -589,12 +574,12 @@
# $(PURE) or $(LDFLAGS) in case someone changes config/shlib.conf
check-unix:: krb5-config
$(SHELL) $(srcdir)/t_krbconf
-check-prerecurse: fake-install
+check-prerecurse: runenv.py
# Create a test realm and spawn a shell in an environment pointing to it.
# If CROSSNUM is set, create that many fully connected test realms and
# point the shell at the first one.
-testrealm: fake-install
+testrealm: runenv.py
PYTHONPATH=$(top_srcdir)/util $(PYTHON) $(srcdir)/util/testrealm.py \
$(CROSSNUM)
Modified: trunk/src/aclocal.m4
===================================================================
--- trunk/src/aclocal.m4 2011-11-04 17:15:37 UTC (rev 25435)
+++ trunk/src/aclocal.m4 2011-11-04 18:39:35 UTC (rev 25436)
@@ -1163,7 +1163,7 @@
esac
OBJLISTS="OBJS.SH"
PLUGIN='$(LIBBASE)$(DYNOBJEXT)'
- PLUGINLINK=
+ PLUGINLINK='../$(PLUGIN)'
PLUGININST=install-plugin
KDB5_PLUGIN_DEPLIBS=
KDB5_PLUGIN_LIBS=
Modified: trunk/src/config/libnover.in
===================================================================
--- trunk/src/config/libnover.in 2011-11-04 17:15:37 UTC (rev 25435)
+++ trunk/src/config/libnover.in 2011-11-04 18:39:35 UTC (rev 25436)
@@ -91,10 +91,19 @@
set -x; objlist=`$(PARSE_OBJLISTS) $(PFOBJLISTS)` && $(AR) cq $@ $$objlist
$(RANLIB) $@
+# For static builds, we make a symlink in the main library directory,
+# allowing the plugin library to be a dependency of the core libraries
+# which use it.
$(TOPLIBD)/libkrb5_$(LIBBASE)$(STLIBEXT):
$(RM) $@
(cd $(TOPLIBD) && $(LN_S) $(RELDIR)/libkrb5_$(LIBBASE)$(STLIBEXT) .)
+# For shared builds, we make a symlink in the parent directory, allowing
+# tests to point plugin_base_dir at $(BUILDTOP)/plugins.
+../$(LIBBASE)$(DYNOBJEXT):
+ $(RM) $@
+ (cd .. && $(LN_S) `basename $(mydir)`/$(LIBBASE)$(DYNOBJEXT) .)
+
all-liblinks: all-libs $(PLUGINLINK)
all-libs: $(PLUGIN)
@@ -102,6 +111,9 @@
$(RM) $(LIBBASE)$(DYNOBJEXT)
$(RM) binutils.versions osf1.exports darwin.exports hpux10.exports
+clean-liblinks:
+ $(RM) $(PLUGINLINK)
+
install-libs: $(PLUGININST)
install-static:
$(RM) $(DESTDIR)$(KRB5_LIBDIR)/libkrb5_$(LIBBASE)$(STLIBEXT)
Modified: trunk/src/config/pre.in
===================================================================
--- trunk/src/config/pre.in 2011-11-04 17:15:37 UTC (rev 25435)
+++ trunk/src/config/pre.in 2011-11-04 18:39:35 UTC (rev 25436)
@@ -142,10 +142,6 @@
VPATH = @srcdir@
CONFIG_RELTOPDIR = @CONFIG_RELTOPDIR@
-FAKEDEST=$(BUILDTOP)/util/fakedest
-FAKEPREFIX=$(FAKEDEST)/$(prefix)
-FAKELIBDIR=$(FAKEPREFIX)/lib
-
# DEFS set by configure
# DEFINES set by local Makefile.in
# LOCALINCLUDES set by local Makefile.in
Modified: trunk/src/config/shlib.conf
===================================================================
--- trunk/src/config/shlib.conf 2011-11-04 17:15:37 UTC (rev 25435)
+++ trunk/src/config/shlib.conf 2011-11-04 18:39:35 UTC (rev 25436)
@@ -97,7 +97,7 @@
# _RLD_ROOT hack needed to repoint "root" directory for purposes
# of searching for shared libs, since RPATHs take precedence over
# LD_LIBRARY_PATH.
- RUN_ENV='LD_LIBRARY_PATH=`echo $(PROG_LIBPATH) | sed -e "s/-L//g" -e "s/ /:/g"`$${LD_LIBRARY_PATH+:$$LD_LIBRARY_PATH}; export LD_LIBRARY_PATH; _RLD_ROOT=$(FAKEDEST):$${_RLD_ROOT+$$_RLD_ROOT}$${_RLD_ROOT-/}; export _RLD_ROOT;'
+ RUN_ENV='LD_LIBRARY_PATH=`echo $(PROG_LIBPATH) | sed -e "s/-L//g" -e "s/ /:/g"`$${LD_LIBRARY_PATH+:$$LD_LIBRARY_PATH}; export LD_LIBRARY_PATH; _RLD_ROOT=$${_RLD_ROOT+$$_RLD_ROOT}$${_RLD_ROOT-/}; export _RLD_ROOT;'
RUN_VARS='LD_LIBRARY_PATH _RLD_ROOT'
;;
@@ -189,7 +189,7 @@
RUN_ENV=
for i in N32 64 ''; do
RUN_ENV="${RUN_ENV+ $RUN_ENV}LD_LIBRARY${i}_PATH=$add\$\${LD_LIBRARY${i}_PATH+:\$\$LD_LIBRARY${i}_PATH}; export LD_LIBRARY${i}_PATH;"
- RUN_ENV="${RUN_ENV} _RLD${i}_ROOT=\$(FAKEDEST):\$\${_RLD${i}_ROOT+\$\${_RLD${i}_ROOT}}\$\${_RLD${i}_ROOT-/}; export _RLD${i}_ROOT;"
+ RUN_ENV="${RUN_ENV} _RLD${i}_ROOT=\$\${_RLD${i}_ROOT+\$\${_RLD${i}_ROOT}}\$\${_RLD${i}_ROOT-/}; export _RLD${i}_ROOT;"
RUN_VARS="$RUN_VARS LD_LIBRARY${i}_PATH _RLD${i}_ROOT"
done
;;
@@ -238,7 +238,7 @@
RUN_ENV=
for i in N32 64 ''; do
RUN_ENV="${RUN_ENV+ $RUN_ENV}LD_LIBRARY${i}_PATH=$add\$\${LD_LIBRARY${i}_PATH+:\$\$LD_LIBRARY${i}_PATH}; export LD_LIBRARY${i}_PATH;"
- RUN_ENV="${RUN_ENV} _RLD${i}_ROOT=\$(FAKEDEST):\$\${_RLD${i}_ROOT+\$\${_RLD${i}_ROOT}}\$\${_RLD${i}_ROOT-/}; export _RLD${i}_ROOT;"
+ RUN_ENV="${RUN_ENV} _RLD${i}_ROOT=\$\${_RLD${i}_ROOT+\$\${_RLD${i}_ROOT}}\$\${_RLD${i}_ROOT-/}; export _RLD${i}_ROOT;"
RUN_VARS="$RUN_VARS LD_LIBRARY${i}_PATH _RLD${i}_ROOT"
done
;;
Modified: trunk/src/kadmin/testing/scripts/env-setup.shin
===================================================================
--- trunk/src/kadmin/testing/scripts/env-setup.shin 2011-11-04 17:15:37 UTC (rev 25435)
+++ trunk/src/kadmin/testing/scripts/env-setup.shin 2011-11-04 18:39:35 UTC (rev 25436)
@@ -26,8 +26,6 @@
BUILDTOP=@RBUILD@
# XXX kludge!
PROG_RPATH=@RBUILD@/lib
-# XXX more kludge!
-FAKEDEST=@RBUILD@/util/fakedest
# This converts $(TOPLIBD) to $TOPLIBD
cat > /tmp/env_setup$$ <<\EOF
@KRB5_RUN_ENV@
Modified: trunk/src/kadmin/testing/scripts/init_db
===================================================================
--- trunk/src/kadmin/testing/scripts/init_db 2011-11-04 17:15:37 UTC (rev 25435)
+++ trunk/src/kadmin/testing/scripts/init_db 2011-11-04 18:39:35 UTC (rev 25436)
@@ -27,7 +27,7 @@
ADMIN=$TOP/dbutil
BIN=$IROOT/bin
ETC=$IROOT/etc
-MODDIR=$TOP/../util/fakedest$libdir/krb5/plugins/kdb
+MODDIR=$TOP/../plugins/kdb
SBIN=$TOP/keytab:$TOP/server
DUMMY=${REALM=SECURE-TEST.OV.COM}; export REALM
Modified: trunk/src/kadmin/testing/scripts/start_servers
===================================================================
--- trunk/src/kadmin/testing/scripts/start_servers 2011-11-04 17:15:37 UTC (rev 25435)
+++ trunk/src/kadmin/testing/scripts/start_servers 2011-11-04 18:39:35 UTC (rev 25436)
@@ -39,7 +39,7 @@
sed -e "s/__REALM__/$REALM/g" -e "s#__K5ROOT__#$K5ROOT#g" \
-e "s/__KDCHOST__/$hostname/g" \
-e "s/__LOCALHOST__/$localname/g" \
- -e "s#__MODDIR__#$TOP/../util/fakedest$libdir/db-modules#g"\
+ -e "s#__MODDIR__#$TOP/../plugins/kdb#g"\
< $STESTDIR/proto/krb5.conf.proto > $K5ROOT/krb5.conf
# Using /usr/ucb/rsh and getting rid of "-k $REALM" until we get
Modified: trunk/src/plugins/authdata/greet/Makefile.in
===================================================================
--- trunk/src/plugins/authdata/greet/Makefile.in 2011-11-04 17:15:37 UTC (rev 25435)
+++ trunk/src/plugins/authdata/greet/Makefile.in 2011-11-04 18:39:35 UTC (rev 25436)
@@ -25,7 +25,7 @@
SRCS= greet_auth.c
-all-unix:: all-liblinks
+all-unix:: all-libs
install-unix:: install-libs
clean-unix:: clean-libs clean-libobjs
Modified: trunk/src/plugins/authdata/greet_client/Makefile.in
===================================================================
--- trunk/src/plugins/authdata/greet_client/Makefile.in 2011-11-04 17:15:37 UTC (rev 25435)
+++ trunk/src/plugins/authdata/greet_client/Makefile.in 2011-11-04 18:39:35 UTC (rev 25436)
@@ -24,7 +24,7 @@
SRCS= greet.c
-all-unix:: all-liblinks
+all-unix:: all-libs
install-unix:: install-libs
clean-unix:: clean-libs clean-libobjs
Modified: trunk/src/plugins/authdata/greet_server/Makefile.in
===================================================================
--- trunk/src/plugins/authdata/greet_server/Makefile.in 2011-11-04 17:15:37 UTC (rev 25435)
+++ trunk/src/plugins/authdata/greet_server/Makefile.in 2011-11-04 18:39:35 UTC (rev 25436)
@@ -24,7 +24,7 @@
SRCS= greet_auth.c
-all-unix:: all-liblinks
+all-unix:: all-libs
install-unix:: install-libs
clean-unix:: clean-libs clean-libobjs
Modified: trunk/src/plugins/kadm5_hook/test/Makefile.in
===================================================================
--- trunk/src/plugins/kadm5_hook/test/Makefile.in 2011-11-04 17:15:37 UTC (rev 25435)
+++ trunk/src/plugins/kadm5_hook/test/Makefile.in 2011-11-04 18:39:35 UTC (rev 25436)
@@ -26,7 +26,7 @@
SRCS= $(srcdir)/main.c
-all-unix:: all-liblinks
+all-unix:: all-libs
install-unix::
clean-unix:: clean-libs clean-libobjs
Modified: trunk/src/plugins/kdb/db2/Makefile.in
===================================================================
--- trunk/src/plugins/kdb/db2/Makefile.in 2011-11-04 17:15:37 UTC (rev 25435)
+++ trunk/src/plugins/kdb/db2/Makefile.in 2011-11-04 18:39:35 UTC (rev 25436)
@@ -70,7 +70,7 @@
all-unix:: all-liblinks
install-unix:: install-libs
-clean-unix:: clean-libs clean-libobjs
+clean-unix:: clean-liblinks clean-libs clean-libobjs
$(DB_DEPS) $(DBOBJLISTS-k5) $(DBSHOBJLISTS): all-recurse
Modified: trunk/src/plugins/kdb/hdb/Makefile.in
===================================================================
--- trunk/src/plugins/kdb/hdb/Makefile.in 2011-11-04 17:15:37 UTC (rev 25435)
+++ trunk/src/plugins/kdb/hdb/Makefile.in 2011-11-04 18:39:35 UTC (rev 25436)
@@ -41,7 +41,7 @@
all-unix:: all-liblinks
install-unix:: install-libs
-clean-unix:: clean-libs clean-libobjs
+clean-unix:: clean-liblinks clean-libs clean-libobjs
$(DB_DEPS) $(DBOBJLISTS-k5) $(DBSHOBJLISTS): all-recurse
Modified: trunk/src/plugins/kdb/ldap/Makefile.in
===================================================================
--- trunk/src/plugins/kdb/ldap/Makefile.in 2011-11-04 17:15:37 UTC (rev 25435)
+++ trunk/src/plugins/kdb/ldap/Makefile.in 2011-11-04 18:39:35 UTC (rev 25436)
@@ -36,7 +36,7 @@
all-unix:: all-liblinks
install-unix:: install-libs
-clean-unix:: clean-libs clean-libobjs
+clean-unix:: clean-liblinks clean-libs clean-libobjs
@libnover_frag@
@libobj_frag@
Modified: trunk/src/plugins/locate/python/Makefile.in
===================================================================
--- trunk/src/plugins/locate/python/Makefile.in 2011-11-04 17:15:37 UTC (rev 25435)
+++ trunk/src/plugins/locate/python/Makefile.in 2011-11-04 18:39:35 UTC (rev 25436)
@@ -21,7 +21,7 @@
all-unix:: all-liblinks
install-unix:: install-libs
-clean-unix:: clean-libs clean-libobjs
+clean-unix:: clean-liblinks clean-libs clean-libobjs
@libnover_frag@
@libobj_frag@
Modified: trunk/src/plugins/preauth/pkinit/Makefile.in
===================================================================
--- trunk/src/plugins/preauth/pkinit/Makefile.in 2011-11-04 17:15:37 UTC (rev 25435)
+++ trunk/src/plugins/preauth/pkinit/Makefile.in 2011-11-04 18:39:35 UTC (rev 25436)
@@ -50,7 +50,7 @@
all-unix:: all-liblinks
install-unix:: install-libs
-clean-unix:: clean-libs clean-libobjs
+clean-unix:: clean-liblinks clean-libs clean-libobjs
clean::
$(RM) lib$(LIBBASE)$(SO_EXT)
Modified: trunk/src/plugins/preauth/securid_sam2/Makefile.in
===================================================================
--- trunk/src/plugins/preauth/securid_sam2/Makefile.in 2011-11-04 17:15:37 UTC (rev 25435)
+++ trunk/src/plugins/preauth/securid_sam2/Makefile.in 2011-11-04 18:39:35 UTC (rev 25436)
@@ -28,7 +28,7 @@
SRCS= $(srcdir)/securid_sam2_main.c $(srcdir)/securid2.c 2
-all-unix:: all-liblinks
+all-unix:: all-libs
install-unix:: install-libs
clean-unix:: clean-libs clean-libobjs
Modified: trunk/src/tests/Makefile.in
===================================================================
--- trunk/src/tests/Makefile.in 2011-11-04 17:15:37 UTC (rev 25435)
+++ trunk/src/tests/Makefile.in 2011-11-04 18:39:35 UTC (rev 25436)
@@ -30,7 +30,7 @@
krb5.conf: Makefile
cat $(top_srcdir)/config-files/krb5.conf > krb5.new
echo "[dbmodules]" >> krb5.new
- echo " db_module_dir = `pwd`/../util/fakedest$(KRB5_DB_MODULE_DIR)" >> krb5.new
+ echo " db_module_dir = `pwd`/../plugins/kdb" >> krb5.new
mv krb5.new krb5.conf
kdb_check: kdc.conf krb5.conf
Modified: trunk/src/tests/dejagnu/Makefile.in
===================================================================
--- trunk/src/tests/dejagnu/Makefile.in 2011-11-04 17:15:37 UTC (rev 25435)
+++ trunk/src/tests/dejagnu/Makefile.in 2011-11-04 18:39:35 UTC (rev 25436)
@@ -40,7 +40,5 @@
site.exp: runenv.vals Makefile
echo "set runvarlist [list `cat runenv.vals | tr '\n' ' '`]" | \
sed -e 's%=\.%='`pwd`'/.%g' > site.exp
- echo "set KRB5_DB_MODULE_DIR {$(KRB5_DB_MODULE_DIR)}" >> site.exp
- echo "set MODULE_DIR {$(MODULE_DIR)}" >> site.exp
echo "set PRIOCNTL_HACK @PRIOCNTL_HACK@" >> site.exp
Modified: trunk/src/tests/dejagnu/config/default.exp
===================================================================
--- trunk/src/tests/dejagnu/config/default.exp 2011-11-04 17:15:37 UTC (rev 25435)
+++ trunk/src/tests/dejagnu/config/default.exp 2011-11-04 18:39:35 UTC (rev 25436)
@@ -911,8 +911,6 @@
global allow_weak_crypto
global mode
global portbase
- global KRB5_DB_MODULE_DIR
- global MODULE_DIR
global srcdir
set pkinit_certs [findfile "[pwd]/$srcdir/pkinit-certs" "[pwd]/$srcdir/pkinit-certs" "$srcdir/pkinit-certs"]
@@ -944,7 +942,7 @@
if { $mode == "tcp" } {
puts $conffile " udp_preference_limit = 1"
}
- puts $conffile " plugin_base_dir = $tmppwd/../../../util/fakedest$MODULE_DIR"
+ puts $conffile " plugin_base_dir = $tmppwd/../../../plugins"
puts $conffile ""
puts $conffile "\[realms\]"
puts $conffile " $REALMNAME = \{"
@@ -973,7 +971,7 @@
puts $conffile " default = FILE:$tmppwd/others.log"
puts $conffile ""
puts $conffile "\[dbmodules\]"
- puts $conffile " db_module_dir = $tmppwd/../../../util/fakedest$KRB5_DB_MODULE_DIR"
+ puts $conffile " db_module_dir = $tmppwd/../../../plugins/kdb"
puts $conffile " foo_db2 = {"
puts $conffile " db_library = db2"
puts $conffile " database_name = $tmppwd/$type-db"
Modified: trunk/src/tests/dejagnu/krb-standalone/standalone.exp
===================================================================
--- trunk/src/tests/dejagnu/krb-standalone/standalone.exp 2011-11-04 17:15:37 UTC (rev 25435)
+++ trunk/src/tests/dejagnu/krb-standalone/standalone.exp 2011-11-04 18:39:35 UTC (rev 25436)
@@ -139,7 +139,6 @@
global portbase
global mode
global tmppwd
- global MODULE_DIR
setup_kerberos_env kdc
@@ -235,7 +234,7 @@
}
# If we have anonymous then test it
- if [file exists "$tmppwd/../../../util/fakedest$MODULE_DIR/preauth/pkinit.so" ] {
+ if [file exists "$tmppwd/../../../plugins/preauth/pkinit.so" ] {
kinit_anonymous "WELLKNOWN/ANONYMOUS"
}
Modified: trunk/src/tests/mkeystash_compat/Makefile.in
===================================================================
--- trunk/src/tests/mkeystash_compat/Makefile.in 2011-11-04 17:15:37 UTC (rev 25435)
+++ trunk/src/tests/mkeystash_compat/Makefile.in 2011-11-04 18:39:35 UTC (rev 25436)
@@ -32,7 +32,7 @@
krb5.conf: Makefile
cat $(top_srcdir)/config-files/krb5.conf > krb5.new
echo "[dbmodules]" >> krb5.new
- echo " db_module_dir = $(BUILDTOP)/util/fakedest$(KRB5_DB_MODULE_DIR)" >> krb5.new
+ echo " db_module_dir = $(BUILDTOP)/plugins/kdb" >> krb5.new
mv krb5.new krb5.conf
# Verify that the mkey stash code is backward compat with old/non-keytab stashfile format
Modified: trunk/src/util/Makefile.in
===================================================================
--- trunk/src/util/Makefile.in 2011-11-04 17:15:37 UTC (rev 25435)
+++ trunk/src/util/Makefile.in 2011-11-04 18:39:35 UTC (rev 25436)
@@ -19,9 +19,6 @@
all-recurse:
-clean-unix::
- $(RM) -r $(FAKEPREFIX)
-
NO_OUTDIR=1
install::
Modified: trunk/src/util/k5test.py
===================================================================
--- trunk/src/util/k5test.py 2011-11-04 17:15:37 UTC (rev 25435)
+++ trunk/src/util/k5test.py 2011-11-04 18:39:35 UTC (rev 25436)
@@ -86,7 +86,7 @@
- $testdir: The realm storage directory (absolute path)
- $buildtop: The root of the build directory
- $srctop: The root of the source directory
- - $plugins: The plugin directory under $buildtop/util/fakedest
+ - $plugins: The plugin directory in the build tree
- $hostname: The FQDN of the host
- $port0: The first listener port (portbase)
- ...
@@ -171,7 +171,7 @@
* srctop: The top of the source directory (absolute path).
-* plugins: The plugin directory under <buildtop>/util/fakedest.
+* plugins: The plugin directory in the build tree (absolute path).
* hostname: This machine's fully-qualified domain name.
@@ -418,16 +418,6 @@
return os.path.abspath(root)
-def _find_plugins():
- global buildtop
- fakeroot = os.path.join(buildtop, 'util', 'fakedest')
- if not os.path.exists(fakeroot):
- fail('You must run "make fake-install" in %s first.' % buildtop)
- for dir, subdirs, files in os.walk(fakeroot):
- if os.path.basename(dir) == 'plugins' and 'kdb' in subdirs:
- return dir
- fail('Cannot locate plugins; run "make fake-install" at %s.' % buildtop)
-
# Return the local hostname as it will be canonicalized by
# krb5_sname_to_principal. We can't simply use socket.getfqdn()
# because it explicitly prefers results containing periods and
@@ -1145,7 +1135,7 @@
_cmd_index = 1
buildtop = _find_buildtop()
srctop = _find_srctop()
-plugins = _find_plugins()
+plugins = os.path.join(buildtop, 'plugins')
_runenv = _import_runenv()
hostname = _get_hostname()
null_input = open(os.devnull, 'r')
More information about the cvs-krb5
mailing list