From 952090aca003968b8e9b47baa865cd6d603b061d Mon Sep 17 00:00:00 2001
From: Marek 'marx' Grac <mgrac@redhat.com>
Date: Tue, 22 Dec 2009 15:51:53 +0100
Subject: [PATCH] fencing: fence_rsa fails to login

New version/firmware have new login screen which was not supported. Also it
is slower, so default timeout for login-timeout is set to 10 seconds.

Resolves: rhbz#549473
---
 fence/agents/lib/fencing.py.py |    2 +-
 fence/agents/rsa/fence_rsa.py  |    1 +
 2 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/fence/agents/lib/fencing.py.py b/fence/agents/lib/fencing.py.py
index 711e17d..b54d1a8 100644
--- a/fence/agents/lib/fencing.py.py
+++ b/fence/agents/lib/fencing.py.py
@@ -802,7 +802,7 @@ def fence_login(options):
 		login_eol = "\r\n"
 
 	try:
-		re_login = re.compile("(login: )|(Login Name:  )|(username: )|(User Name :)", re.IGNORECASE)
+		re_login = re.compile("(login\s*: )|(Login Name:  )|(username: )|(User Name :)", re.IGNORECASE)
 		re_pass  = re.compile("password", re.IGNORECASE)
 
 		if options.has_key("-z"):
diff --git a/fence/agents/rsa/fence_rsa.py b/fence/agents/rsa/fence_rsa.py
index 7611298..ed794fa 100755
--- a/fence/agents/rsa/fence_rsa.py
+++ b/fence/agents/rsa/fence_rsa.py
@@ -46,6 +46,7 @@ def main():
 
 	atexit.register(atexit_handler)
 
+	all_opt["login_timeout"]["default"] = 10
 	options = check_input(device_opt, process_input(device_opt))
 
 	## 
-- 
1.6.0.6