Fix the expect string so that it doesn't assume that the client is

using its fully qualified domain name as its local hostname.  We now
check to make sure that FTP banner contains $localhostname, plus
optional characters (which can be the domainname depending on the
system.)

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

diff --git a/src/tests/dejagnu/krb-standalone/ChangeLog b/src/tests/dejagnu/krb-standalone/ChangeLog
index e66d7714c274235829f4d65b22318c36bfeabc3f..0430684a1585a706a7bd6f0abb79be55efe0f702 100644 (file)
--- a/src/tests/dejagnu/krb-standalone/ChangeLog
+++ b/src/tests/dejagnu/krb-standalone/ChangeLog
@@ -1,3 +1,11 @@
+Wed Apr 17 17:53:51 1996  Theodore Y. Ts'o  <tytso@mit.edu>
+
+       * gssftp.exp: Fix the expect string so that it doesn't assume that
+               the client is using its fully qualified domain name as its
+               local hostname.  We now check to make sure that FTP banner
+               contains $localhostname, plus optional characters (which
+               can be the domainname depending on the system.)
+
 Mon Apr  8 14:13:06 1996  Ezra Peisach  <epeisach@kangaroo.mit.edu>
 
        * rcp.exp: Invoke kshd with -L for every environment variable we

diff --git a/src/tests/dejagnu/krb-standalone/gssftp.exp b/src/tests/dejagnu/krb-standalone/gssftp.exp
index 7b8ad91bc10a843ebbf41ddc23ba769f51b3bf11..c541414fb099795491cdd86446159bca760cdc64 100644 (file)
--- a/src/tests/dejagnu/krb-standalone/gssftp.exp
+++ b/src/tests/dejagnu/krb-standalone/gssftp.exp
@@ -177,7 +177,7 @@ proc ftp_test { } {
 
     set testname "ftp connection"
     expect "Connected to $hostname"
-    expect -re "$hostname FTP server .Version \[0-9.\]*. ready."
+    expect -re "$localhostname.*FTP server .Version \[0-9.\]*. ready."
     expect -re "Using authentication type GSSAPI; ADAT must follow"
     expect "GSSAPI accepted as authentication type"
     expect "GSSAPI authentication succeeded"