From: Tom Yu <tlyu@mit.edu>
Date: Mon, 28 Sep 2009 21:27:42 +0000 (+0000)
Subject: pull up r22435 from trunk
X-Git-Tag: krb5-1.7.1-beta1~33
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=fb7578c55366c4bedd0258188be342a2192d94a5;p=krb5.git

pull up r22435 from trunk

 ------------------------------------------------------------------------
 r22435 | tlyu | 2009-07-10 15:46:20 -0400 (Fri, 10 Jul 2009) | 9 lines

 ticket: 6530
 target_version: 1.7.1
 tags: pullup
 subject: check for slogin failure in setup_root_shell

 Add a check for a slogin message that indicates an unknown public key
 fingerprint, as rlogin looks like it points to slogin by default on
 Debian Lenny.

ticket: 6530
version_fixed: 1.7.1
status: resolved

git-svn-id: svn://anonsvn.mit.edu/krb5/branches/krb5-1-7@22805 dc483132-0cff-0310-8789-dd5450dbe970
---

diff --git a/src/tests/dejagnu/config/default.exp b/src/tests/dejagnu/config/default.exp
index 65816a10d..5c2da5048 100644
--- a/src/tests/dejagnu/config/default.exp
+++ b/src/tests/dejagnu/config/default.exp
@@ -2508,7 +2508,7 @@ proc setup_root_shell { testname } {
 	    set got_refused 1
 	    exp_continue
 	}
-	-re "word:|erberos rlogin failed|ection refused|ection reset by peer|not authorized|Ticket expired" {
+	-re "word:|erberos rlogin failed|ection refused|ection reset by peer|not authorized|Ticket expired|authenticity of" {
 	    note "$testname test requires ability to rlogin as root"
 	    unsupported "$testname"
 	    set timeout $old_timeout