Changes to start up kshd (not krshd) with new arguments

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

3 files changed, 14 insertions, 8 deletions

diff --git a/src/tests/dejagnu/krb-standalone/ChangeLog b/src/tests/dejagnu/krb-standalone/ChangeLog
index 39d3fc57f..44a30777b 100644
--- a/src/tests/dejagnu/krb-standalone/ChangeLog
+++ b/src/tests/dejagnu/krb-standalone/ChangeLog
@@ -1,3 +1,9 @@
+Sun Mar  3 14:35:27 1996  Ezra Peisach  <epeisach@kangaroo.mit.edu>
+
+	* rcp.exp, rsh.exp: Change name of kshd to match current executable
+		name. Change calling arguments to match current usage.
+	
+
 Sat Jan 27 01:10:39 1996  Mark Eichin  <eichin@cygnus.com>
 
 	* kadmin.exp: use a longer password for kadmin_modify test to meet
diff --git a/src/tests/dejagnu/krb-standalone/rcp.exp b/src/tests/dejagnu/krb-standalone/rcp.exp
index b9300eed9..7c3948219 100644
--- a/src/tests/dejagnu/krb-standalone/rcp.exp
+++ b/src/tests/dejagnu/krb-standalone/rcp.exp
@@ -12,7 +12,7 @@ if ![info exists RCP] {
 }
 
 if ![info exists KRSHD] {
-    set KRSHD [findfile $objdir/../../appl/bsd/krshd]
+    set KRSHD [findfile $objdir/../../appl/bsd/kshd]
 }
 
 # Make sure .k5login is reasonable.
@@ -40,7 +40,7 @@ proc start_rsh_daemon { } {
 
     # The -D argument tells it to accept a single connection, so we
     # don't need to use inetd.  The 3544 is the port to listen at.
-    spawn $KRSHD -K -D 3544 -P [file dirname $RCP] -S $tmppwd/srvtab -M KRBTEST.COM
+    spawn $KRSHD -k -c -D 3544 -P [file dirname $RCP] -S $tmppwd/srvtab -M KRBTEST.COM
     set krshd_spawn_id $spawn_id
     set krshd_pid [exp_pid]
 
diff --git a/src/tests/dejagnu/krb-standalone/rsh.exp b/src/tests/dejagnu/krb-standalone/rsh.exp
index 118e59608..c91f8d57f 100644
--- a/src/tests/dejagnu/krb-standalone/rsh.exp
+++ b/src/tests/dejagnu/krb-standalone/rsh.exp
@@ -12,7 +12,7 @@ if ![info exists RSH] {
 }
 
 if ![info exists KRSHD] {
-    set KRSHD [findfile $objdir/../../appl/bsd/krshd]
+    set KRSHD [findfile $objdir/../../appl/bsd/kshd]
 }
 
 # Make sure .k5login is reasonable.
@@ -38,7 +38,7 @@ proc start_rsh_daemon { option } {
 
     # The -D argument tells it to accept a single connection, so we
     # don't need to use inetd.  The 3544 is the port to listen at.
-    spawn $KRSHD -K -D 3544 -S $tmppwd/srvtab -M KRBTEST.COM -A $option
+    spawn $KRSHD -k -c -D 3544 -S $tmppwd/srvtab -M KRBTEST.COM -A $option
     set krshd_spawn_id $spawn_id
     set krshd_pid [exp_pid]
 
@@ -82,7 +82,7 @@ proc rsh_test { } {
     }
 
     # Start up the rsh daemon.
-    start_rsh_daemon -K
+    start_rsh_daemon -k
 
     # Run rsh date.
     set testname "date"
@@ -117,7 +117,7 @@ proc rsh_test { } {
 
     # Check encrypted rsh.
     set failed no
-    start_rsh_daemon -x
+    start_rsh_daemon -ek
     set testname "encrypted rsh"
     spawn $RSH $hostname -x -k KRBTEST.COM -D 3544 -A echo hello
     expect {
@@ -144,7 +144,7 @@ proc rsh_test { } {
     }
 
     # Check stderr
-    start_rsh_daemon -K
+    start_rsh_daemon -k
     set testname "rsh to stderr"
     spawn $RSH $hostname -k KRBTEST.COM -D 3544 -A $BINSH -c "'echo hello 1>&2'"
     expect {
@@ -165,7 +165,7 @@ proc rsh_test { } {
 
     pass $testname
 
-    start_rsh_daemon -x
+    start_rsh_daemon -e
     set testname "encrypted rsh to stderr"
     spawn $RSH $hostname -x -k KRBTEST.COM -D 3544 -A $BINSH -c "'echo hello 1>&2'"
     expect {