Before the error-message tests, make sure the host principal exists,

so we get consistent errors.  Expect the "keytab not found" error,
rather than the "principal doesn't exist" error.

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

diff --git a/src/tests/dejagnu/krb-standalone/gssftp.exp b/src/tests/dejagnu/krb-standalone/gssftp.exp
index a66586ac5cba1357033ca98503f4b87fe52a4871..53bc265279f5e36889627e3d0790126464b0b9c4 100644 (file)
--- a/src/tests/dejagnu/krb-standalone/gssftp.exp
+++ b/src/tests/dejagnu/krb-standalone/gssftp.exp
@@ -180,6 +180,8 @@ proc ftp_test { } {
        || ![kinit $env(USER) $env(USER)$KEY 0]} {
        return
     }
+    # Force the host key to exist, so we get consistent errors below.
+    catch "add_random_key host/$hostname 0"
 
     #
     # Save settings of KRB5_KTNAME
@@ -224,11 +226,11 @@ proc ftp_test { } {
     expect "GSSAPI accepted as authentication type"
     expect -re "Trying to authenticate to <ftp@.*>"
     # The ftp client doesn't print the gssapi error except on the last attempt.
+#    expect "GSSAPI error major: Unspecified GSS failure."
+#    expect -re "GSSAPI error minor: Key table file '.*' not found"
+    expect -re "Trying to authenticate to <host@.*>"
     expect "GSSAPI error major: Unspecified GSS failure."
     expect -re "GSSAPI error minor: Key table file '.*' not found"
-#    expect -re "Trying to authenticate to <host@.*>"
-#    expect "GSSAPI error major: Unspecified GSS failure."
-#    expect -re "GSSAPI error minor: Server host/.* not found in Kerberos database"
     expect -re "Name (.*): "
     close -i $spawn_id
     wait -i $spawn_id