From: Ezra Peisach <epeisach@mit.edu>
Date: Mon, 8 Apr 1996 19:34:12 +0000 (+0000)
Subject:         * rcp.exp: Invoke kshd with -L for every environment variable we
X-Git-Tag: krb5-1.0-beta6~256
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=1011532454c037f2366864eac19662814a8cac1f;p=krb5.git

    * rcp.exp: Invoke kshd with -L for every environment variable we
                want passed to invoke rcp with...

We also tell kshd to pass on ENV_SET because at MIT,
csh -c rcp.... will source the users .cshrc - which at MIT sets
LD_LIBRARY_PATH on the SUNS... We cannot use other options like
-f as the user may have sh as their shell. Probably kshd should recognize
rcp and invoke rcp without the shell invocation....

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

diff --git a/src/tests/dejagnu/krb-standalone/ChangeLog b/src/tests/dejagnu/krb-standalone/ChangeLog
index 089c339c7..e66d7714c 100644
--- a/src/tests/dejagnu/krb-standalone/ChangeLog
+++ b/src/tests/dejagnu/krb-standalone/ChangeLog
@@ -1,3 +1,8 @@
+Mon Apr  8 14:13:06 1996  Ezra Peisach  <epeisach@kangaroo.mit.edu>
+
+	* rcp.exp: Invoke kshd with -L for every environment variable we
+		want passed to invoke rcp with...
+
 Fri Mar 15 15:09:17 1996  Ezra Peisach  <epeisach@kangaroo.mit.edu>
 
 	* gssftp.exp: Add dejagnu for GSS-API ftp.
diff --git a/src/tests/dejagnu/krb-standalone/rcp.exp b/src/tests/dejagnu/krb-standalone/rcp.exp
index d4d9f512b..8e8b56966 100644
--- a/src/tests/dejagnu/krb-standalone/rcp.exp
+++ b/src/tests/dejagnu/krb-standalone/rcp.exp
@@ -38,10 +38,27 @@ proc start_rsh_daemon { } {
     global tmppwd
     global krshd_spawn_id
     global krshd_pid
+    global krb5_init_vars
+
+    set opt(0) ""
+    set opt(1) ""
+    set opt(2) ""
+    set opt(3) ""
+    for {set i 0} {$i < [llength $krb5_init_vars]} {incr i} {
+	regexp "^(\[^=\]*)=(.*)" [lindex $krb5_init_vars $i] foo evar evalue
+	set opt($i) "-L$evar"
+    }
 
     # 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 -c -D 3544 -P [file dirname $RCP] -S $tmppwd/srvtab -M $REALMNAME
+    #
+    # The -L ENV_SET is for the I/S Athena brokeness in dot files where
+    #	LD_LIBRARY_PATH will be overridden causing the "exec csh -c rcp ..." 
+    #	to fail as the .cshrc is read in. We do not use the -f option as
+    #	a users shell might be sh...
+    #	Later a proper fix would be to have kshd exec rcp directly
+    #   shell indirection...
+    spawn $KRSHD -k -c -D 3544 -P [file dirname $RCP] -S $tmppwd/srvtab -M $REALMNAME -L ENV_SET $opt(0) $opt(1) $opt(2) $opt(3) 
     set krshd_spawn_id $spawn_id
     set krshd_pid [exp_pid]