svn rev #21878: trunk/src/ config/ kadmin/testing/scripts/
raeburn@MIT.EDU
raeburn at MIT.EDU
Tue Feb 3 22:18:06 EST 2009
http://src.mit.edu/fisheye/changelog/krb5/?cs=21878
Commit By: raeburn
Log Message:
remove some krb4 testing hooks
Changed Files:
U trunk/src/config/pre.in
U trunk/src/kadmin/testing/scripts/Makefile.in
U trunk/src/kadmin/testing/scripts/env-setup.shin
D trunk/src/kadmin/testing/scripts/fixup-conf-files.plin
D trunk/src/kadmin/testing/scripts/save_files.sh
U trunk/src/kadmin/testing/scripts/start_servers
U trunk/src/kadmin/testing/scripts/start_servers_local
U trunk/src/kadmin/testing/scripts/stop_servers
U trunk/src/kadmin/testing/scripts/stop_servers_local
Modified: trunk/src/config/pre.in
===================================================================
--- trunk/src/config/pre.in 2009-02-04 02:41:24 UTC (rev 21877)
+++ trunk/src/config/pre.in 2009-02-04 03:18:04 UTC (rev 21878)
@@ -230,12 +230,9 @@
TESTDIR = $(BUILDTOP)/kadmin/testing
STESTDIR = $(SRCTOP)/kadmin/testing
COMPARE_DUMP = $(TESTDIR)/scripts/compare_dump.pl
-FIX_CONF_FILES = $(TESTDIR)/scripts/fixup-conf-files.pl
INITDB = $(STESTDIR)/scripts/init_db
MAKE_KEYTAB = $(TESTDIR)/scripts/make-host-keytab.pl
LOCAL_MAKE_KEYTAB= $(TESTDIR)/scripts/make-host-keytab.pl
-RESTORE_FILES = $(STESTDIR)/scripts/restore_files.sh
-SAVE_FILES = $(STESTDIR)/scripts/save_files.sh
ENV_SETUP = $(TESTDIR)/scripts/env-setup.sh
CLNTTCL = $(TESTDIR)/util/ovsec_kadm_clnt_tcl
SRVTCL = $(TESTDIR)/util/ovsec_kadm_srv_tcl
Modified: trunk/src/kadmin/testing/scripts/Makefile.in
===================================================================
--- trunk/src/kadmin/testing/scripts/Makefile.in 2009-02-04 02:41:24 UTC (rev 21877)
+++ trunk/src/kadmin/testing/scripts/Makefile.in 2009-02-04 03:18:04 UTC (rev 21878)
@@ -6,10 +6,10 @@
.SUFFIXES: .plin .pl
-GEN_SCRIPTS = compare_dump.pl fixup-conf-files.pl make-host-keytab.pl \
+GEN_SCRIPTS = compare_dump.pl make-host-keytab.pl \
simple_dump.pl verify_xrunner_report.pl qualname.pl
-all:: env-setup.sh $(GEN_SCRIPTS) restore_files.sh
+all:: env-setup.sh $(GEN_SCRIPTS)
# Should only rebuild env_setup.sh here (use CONFIG_FILES=), but the weird krb5
# makefile post-processing is unconditional and would trash the makefile.
@@ -22,10 +22,6 @@
chmod +x env-setup.sh
touch env-setup.stamp
-restore_files.sh:
- rm -f restore_files.sh
- ln -s $(srcdir)/save_files.sh restore_files.sh
-
.plin.pl:
-rm -f $@.tmp
echo "#!$(PERL_PATH)" > $@.tmp
@@ -34,4 +30,4 @@
mv $@.tmp $@
clean::
- -rm -f $(GEN_SCRIPTS) *.tmp env-setup.sh env-setup.stamp restore_files.sh
+ -rm -f $(GEN_SCRIPTS) *.tmp env-setup.sh env-setup.stamp
Modified: trunk/src/kadmin/testing/scripts/env-setup.shin
===================================================================
--- trunk/src/kadmin/testing/scripts/env-setup.shin 2009-02-04 02:41:24 UTC (rev 21877)
+++ trunk/src/kadmin/testing/scripts/env-setup.shin 2009-02-04 03:18:04 UTC (rev 21878)
@@ -66,14 +66,10 @@
fi
COMPARE_DUMP=$TESTDIR/scripts/compare_dump.pl; export COMPARE_DUMP
-FIX_CONF_FILES=$TESTDIR/scripts/fixup-conf-files.pl
-export FIX_CONF_FILES
INITDB=$STESTDIR/scripts/init_db; export INITDB
MAKE_KEYTAB=$TESTDIR/scripts/make-host-keytab.pl; export MAKE_KEYTAB
LOCAL_MAKE_KEYTAB=$TESTDIR/scripts/make-host-keytab.pl
export LOCAL_MAKE_KEYTAB
-RESTORE_FILES=$TESTDIR/scripts/restore_files.sh; export RESTORE_FILES
-SAVE_FILES=$STESTDIR/scripts/save_files.sh; export SAVE_FILES
SIMPLE_DUMP=$TESTDIR/scripts/simple_dump.pl; export SIMPLE_DUMP
QUALNAME=$TESTDIR/scripts/qualname.pl; export QUALNAME
TCLUTIL=$STESTDIR/tcl/util.t; export TCLUTIL
Deleted: trunk/src/kadmin/testing/scripts/fixup-conf-files.plin
Deleted: trunk/src/kadmin/testing/scripts/save_files.sh
Modified: trunk/src/kadmin/testing/scripts/start_servers
===================================================================
--- trunk/src/kadmin/testing/scripts/start_servers 2009-02-04 02:41:24 UTC (rev 21877)
+++ trunk/src/kadmin/testing/scripts/start_servers 2009-02-04 03:18:04 UTC (rev 21878)
@@ -11,8 +11,6 @@
DUMMY=${TESTDIR=$TOP/testing}
DUMMY=${STESTDIR=$STOP/testing}
-DUMMY=${SAVE_FILES=$STESTDIR/scripts/save_files.sh}
-DUMMY=${FIX_CONF_FILES=$TESTDIR/scripts/fixup-conf-files.pl}
DUMMY=${START_SERVERS_LOCAL=$STESTDIR/scripts/start_servers_local}
# This'll be wrong sometimes
DUMMY=${RSH_CMD=rsh}
Modified: trunk/src/kadmin/testing/scripts/start_servers_local
===================================================================
--- trunk/src/kadmin/testing/scripts/start_servers_local 2009-02-04 02:41:24 UTC (rev 21877)
+++ trunk/src/kadmin/testing/scripts/start_servers_local 2009-02-04 03:18:04 UTC (rev 21878)
@@ -2,8 +2,6 @@
DUMMY=${TESTDIR=$TOP/testing}
DUMMY=${STESTDIR=$STOP/testing}
-DUMMY=${SAVE_FILES=$STESTDIR/scripts/save_files.sh}
-DUMMY=${FIX_CONF_FILES=$TESTDIR/scripts/fixup-conf-files.pl}
DUMMY=${INITDB=$STESTDIR/scripts/init_db}
DUMMY=${SRVTCL=$TESTDIR/util/ovsec_kadm_srv_tcl}; export SRVTCL
DUMMY=${LOCAL_MAKE_KEYTAB=$TESTDIR/scripts/make-host-keytab.pl}
@@ -24,7 +22,6 @@
REDIRECT='>/dev/null'
fi
-v4files=false
while :; do
case $1 in
-keysalt)
@@ -43,13 +40,6 @@
break
fi
;;
- -v4files)
- if [ "`whoami`" != "root" ]; then
- echo "You must be root to use -v4files!" 1>&2
- exit 1
- fi
- v4files=true
- ;;
*)
break
;;
@@ -65,12 +55,6 @@
export TOP
fi
-# fixup the system config files
-if $v4files; then
- $SAVE_FILES || exit 1
- $FIX_CONF_FILES || exit 1
-fi
-
# create a fresh db
$INITDB "$keysalts" || exit 1
Modified: trunk/src/kadmin/testing/scripts/stop_servers
===================================================================
--- trunk/src/kadmin/testing/scripts/stop_servers 2009-02-04 02:41:24 UTC (rev 21877)
+++ trunk/src/kadmin/testing/scripts/stop_servers 2009-02-04 03:18:04 UTC (rev 21878)
@@ -11,11 +11,9 @@
DUMMY=${TESTDIR=$TOP/testing}
DUMMY=${STESTDIR=$STOP/testing}
-DUMMY=${FIX_CONF_FILES=$TESTDIR/scripts/fixup-conf-files.pl}
DUMMY=${STOP_SERVERS_LOCAL=$STESTDIR/scripts/stop_servers_local}
# This'll be wrong sometimes
DUMMY=${RSH_CMD=rsh}
-DUMMY=${RESTORE_FILES=$TESTDIR/scripts/restore_files.sh}
local=1
Modified: trunk/src/kadmin/testing/scripts/stop_servers_local
===================================================================
--- trunk/src/kadmin/testing/scripts/stop_servers_local 2009-02-04 02:41:24 UTC (rev 21877)
+++ trunk/src/kadmin/testing/scripts/stop_servers_local 2009-02-04 03:18:04 UTC (rev 21878)
@@ -1,18 +1,13 @@
#!/bin/sh
DUMMY=${TESTDIR=$TOP/testing}
-DUMMY=${RESTORE_FILES=$TESTDIR/scripts/restore_files.sh}
DUMMY=${KRB5RCACHEDIR=$TESTDIR}
-v4files=false
while [ $# -gt 0 ] ; do
case $1 in
-start_servers)
start_servers=$1
;;
- -v4files)
- v4files=true
- ;;
*)
TOP=$1
export TOP
@@ -46,8 +41,4 @@
fi
rm -f $KRB5RCACHEDIR/krb5kdc_rcache.$USER
-# restore saved system config files
-if $v4files; then
- $RESTORE_FILES $start_servers
-fi
exit 0
More information about the cvs-krb5
mailing list