fence-agents: RHEL6 - fencing: Validation if password/password_script or identity file is used was not processed

Gitweb: http://git.fedorahosted.org/git/?p=fence-agents.git;a=commitdiff;h=2acb7f... Commit: 2acb7fe7fb97ba27b31f50442dd886be0e929e1b Parent: 3048ba31835713334b251012ae935e858f62095b Author: Marek 'marx' Grac <mgrac(a)redhat.com&gt; AuthorDate: Fri May 24 16:17:12 2013 +0200 Committer: Marek 'marx' Grac <mgrac(a)redhat.com&gt; CommitterDate: Fri Jun 28 11:09:53 2013 +0200 fencing: Validation if password/password_script or identity file is used was not processed Resolves: rhbz#959490 --- fence/agents/lib/fencing.py.py | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/fence/agents/lib/fencing.py.py b/fence/agents/lib/fencing.py.py index cb8ec26..ad5f4db 100644 --- a/fence/agents/lib/fencing.py.py +++ b/fence/agents/lib/fencing.py.py @@ -698,9 +698,9 @@ def check_input(device_opt, opt): if 0 == device_opt.count("identity_file"): if 0 == (options.has_key("-p") or options.has_key("-S")): fail_usage("Failed: You have to enter password or password script") - else: - if 0 == (options.has_key("-p") or options.has_key("-S") or options.has_key("-k")): - fail_usage("Failed: You have to enter password, password script or identity file") + else: + if 0 == (options.has_key("-p") or options.has_key("-S") or options.has_key("-k")): + fail_usage("Failed: You have to enter password, password script or identity file") if 0 == options.has_key("-x") and 1 == options.has_key("-k"): fail_usage("Failed: You have to use identity file together with ssh connection (-x)")