* rsh.exp: Setup a wrapper script in executing klist in the remote

		shell so that environment variables are properly set.

	* kadmin.exp: (kpasswd_cpw): After giving new password, wait for
		the newline or we hang waiting for the process to finish.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@7904 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/tests/dejagnu/krb-standalone/ChangeLog b/src/tests/dejagnu/krb-standalone/ChangeLog
index cce3a4fdf2bb05248feb2c9038f47a69a67df3df..06518e500d14aa7fe730ce62097f29044f478909 100644 (file)
--- a/src/tests/dejagnu/krb-standalone/ChangeLog
+++ b/src/tests/dejagnu/krb-standalone/ChangeLog
@@ -1,3 +1,11 @@
+Mon May  6 08:05:33 1996  Ezra Peisach  <epeisach@kangaroo.mit.edu>
+
+       * rsh.exp: Setup a wrapper script in executing klist in the remote
+               shell so that environment variables are properly set.
+
+       * kadmin.exp: (kpasswd_cpw): After giving new password, wait for
+               the newline or we hang waiting for the process to finish. 
+
 Fri May  3 21:44:24 1996  Ken Raeburn  <raeburn@cygnus.com>
 
        Fri Mar 29 15:05:30 1996  Chris Provenzano  <proven@cygnus.com>

diff --git a/src/tests/dejagnu/krb-standalone/kadmin.exp b/src/tests/dejagnu/krb-standalone/kadmin.exp
index f088b0f905db22edd3fa0084a1bdc004fe75cb5b..2db630300d5350ffcc2da6168525adbed2818253 100644 (file)
--- a/src/tests/dejagnu/krb-standalone/kadmin.exp
+++ b/src/tests/dejagnu/krb-standalone/kadmin.exp
@@ -727,6 +727,8 @@ proc kpasswd_cpw { princ opw npw } {
     expect "Enter old password for $princ:" { send "$opw\r" }
     expect "Enter new password:" { send "$npw\r" }
     expect "Re-enter new password:" { send "$npw\r" }
+    expect "\r"
+
     if ![check_exit_status "kpasswd"] {
        fail "kpasswd $princ $npw"
        return 0

diff --git a/src/tests/dejagnu/krb-standalone/rsh.exp b/src/tests/dejagnu/krb-standalone/rsh.exp
index e1e11dc6d212acb8d9af361849fe1dc6d1b6a824..313cdd607b2dbff4652427f119b5d49ec8317808 100644 (file)
--- a/src/tests/dejagnu/krb-standalone/rsh.exp
+++ b/src/tests/dejagnu/krb-standalone/rsh.exp
@@ -77,6 +77,7 @@ proc rsh_test { } {
     global hostname
     global env
     global spawn_id
+    global tmppwd
 
     # Start up the kerberos and kadmind daemons and get a srvtab and a
     # ticket file.
@@ -154,7 +155,12 @@ proc rsh_test { } {
     set failed no
     start_rsh_daemon -k
     set testname "rsh forwarding tickets"
-    spawn $RSH $hostname -f -k $REALMNAME -D 3544 -A $BINSH -c $KLIST
+
+    # We need a wrapper for klist in order to setup for shared library 
+    # runtime environment
+    setup_wrapper $tmppwd/klist.wrap $KLIST
+
+    spawn $RSH $hostname -f -k $REALMNAME -D 3544 -A $BINSH -c $tmppwd/klist.wrap 
     expect {
        "Ticket cache:" { }
        "klist: No credentials cache file found" {
@@ -183,7 +189,7 @@ proc rsh_test { } {
     set failed no
     start_rsh_daemon -e
     set testname "encrypted rsh forwarding tickets"
-    spawn $RSH $hostname -x -f -k $REALMNAME -D 3544 -A $BINSH -c $KLIST
+    spawn $RSH $hostname -x -f -k $REALMNAME -D 3544 -A $BINSH -c $tmppwd/klist.wrap 
     expect {
        "Ticket cache:" { }
        "klist: No credentials cache file found" {