From 17a8bfcd38fd6cb4f91afc1b6e48d2b06d2ae24d Mon Sep 17 00:00:00 2001 From: Ezra Peisach Date: Mon, 6 May 1996 16:09:31 +0000 Subject: [PATCH] Use a wrapper script when invoking login.krb5 in order for shared libraries to be setup properly. git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@7903 dc483132-0cff-0310-8789-dd5450dbe970 --- src/tests/dejagnu/krb-root/ChangeLog | 5 +++++ src/tests/dejagnu/krb-root/telnet.exp | 10 +++++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/src/tests/dejagnu/krb-root/ChangeLog b/src/tests/dejagnu/krb-root/ChangeLog index 3f0d1db5c..de6e521f9 100644 --- a/src/tests/dejagnu/krb-root/ChangeLog +++ b/src/tests/dejagnu/krb-root/ChangeLog @@ -1,3 +1,8 @@ +Mon May 6 11:44:18 1996 Ezra Peisach + + * telnet.exp: Use a wrapper script for login.krb5 to setup shared + libraries properly. + Fri Mar 29 01:34:47 1996 Marc Horowitz * telnet.exp (start_telnet_daemon) use sh -c around telnetd diff --git a/src/tests/dejagnu/krb-root/telnet.exp b/src/tests/dejagnu/krb-root/telnet.exp index fb62effaf..d3244ebaf 100644 --- a/src/tests/dejagnu/krb-root/telnet.exp +++ b/src/tests/dejagnu/krb-root/telnet.exp @@ -19,6 +19,9 @@ if ![info exists LOGINKRB5] { set LOGINKRB5 [findfile $objdir/../../appl/bsd/login.krb5] } +# Remove old wrapper script + catch "exec rm -f $tmppwd/login.wrap" + # Start up a root shell. if ![setup_root_shell telnet] { return @@ -51,11 +54,16 @@ proc start_telnet_daemon { } { global rlogin_spawn_id global telnetd_pid + # Setup the shared library wrapper for login.krb5 + if ![file exists $tmppwd/login.wrap] { + setup_wrapper $tmppwd/login.wrap "$LOGINKRB5 $*" + } + # The -debug argument tells it to accept a single connection, so # we don't need to use inetd. The 3023 is the port to listen at. # Note that tmppwd here is a shell variable, which is set in # setup_root_shell, not a TCL variable. - send -i $rlogin_spawn_id "sh -c \"$TELNETD -debug -t \$tmppwd/srvtab -R $REALMNAME -L \\\r$LOGINKRB5 -X KERBEROS_V4 3023\" &\r" + send -i $rlogin_spawn_id "sh -c \"$TELNETD -debug -t \$tmppwd/srvtab -R $REALMNAME -L $tmppwd/login.wrap -X KERBEROS_V4 3023\" &\r" expect { -i $rlogin_spawn_id -re "$ROOT_PROMPT" { } -- 2.26.2