cluster: STABLE3 - fencing: fence_rsa fails to login

[Marek Grác]

Gitweb:        http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=1f2...
Commit:        1f283367656fdad0ae5fd66c2cd58ec0fc08f9f4
Parent:        8afc2b31b9f5742b5ab56b35cf34e01c75284a00
Author:        Marek 'marx' Grac 
AuthorDate:    Tue Dec 22 15:51:53 2009 +0100
Committer:     Marek 'marx' Grac 
CommitterDate: Tue Dec 22 15:51:53 2009 +0100

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 70bdd34..2617492 100644
--- a/fence/agents/lib/fencing.py.py
+++ b/fence/agents/lib/fencing.py.py
@@ -804,7 +804,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 133129e..eb5b635 100644
--- 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))

##