diff options
| author | Tom Yu <tlyu@mit.edu> | 2006-06-14 22:27:54 +0000 |
|---|---|---|
| committer | Tom Yu <tlyu@mit.edu> | 2006-06-14 22:27:54 +0000 |
| commit | 4c2bc7a022bff031e101a88363ff7756871e8721 (patch) | |
| tree | e2fcdfdbf65e10c6546068e54d832b4a4c237c70 /src/tests | |
| parent | c162f7fadad60a02fc35ba14d1b7e52f225460a4 (diff) | |
| download | krb5-4c2bc7a022bff031e101a88363ff7756871e8721.tar.gz krb5-4c2bc7a022bff031e101a88363ff7756871e8721.tar.xz krb5-4c2bc7a022bff031e101a88363ff7756871e8721.zip | |
Merge from branches/mechglue. Initial integration of Sun-donated
mechglue and SPNEGO implementations. Additional changes outside of
src/lib/gssapi:
* src/configure.in: Add lib/gssapi/mechglue and lib/gssapi/spnego
to list of directories to output Makefile in.
* src/lib/rpc/unit-test/rpc_test.0/expire.exp (expired): Update
regexp for mechglue.
* src/tests/dejagnu/krb-standalone/v4gssftp.exp (v4ftp_test):
Update "Miscellaneous failure" regexp for mechglue.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@18131 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/tests')
| -rw-r--r-- | src/tests/dejagnu/krb-standalone/v4gssftp.exp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/tests/dejagnu/krb-standalone/v4gssftp.exp b/src/tests/dejagnu/krb-standalone/v4gssftp.exp index e739e9bd98..6353dc41f1 100644 --- a/src/tests/dejagnu/krb-standalone/v4gssftp.exp +++ b/src/tests/dejagnu/krb-standalone/v4gssftp.exp @@ -249,7 +249,7 @@ proc v4ftp_test { } { expect -nocase -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 error major: Miscellaneous failure" + expect -re "GSSAPI error major: (Unspecified GSS|Miscellaneous) failure" expect { "GSSAPI error minor: Unsupported credentials cache format version number" {} "GSSAPI error minor: No credentials cache found" {} |