Blame SOURCES/bz1048843-fencing-do_not_use_public_keys.patch
|
 |
182b9e |
commit cfd1f7490d7958ee25ad5937c9f2072adaa9862e
|
|
|
182b9e |
Author: Marek 'marx' Grac <mgrac@redhat.com>
|
|
|
182b9e |
Date: Mon Jan 6 13:25:43 2014 +0100
|
|
|
182b9e |
|
|
|
182b9e |
fencing: Do not use public keys when identity-file is not defined
|
|
|
182b9e |
|
|
|
182b9e |
Previously, fence agent (ssh) tried to use keys before it asks for password. This lead to a situation
|
|
|
182b9e |
when fence agent did not work correctly as it was waiting for 'Password' which did not occur.
|
|
|
182b9e |
|
|
|
182b9e |
diff --git a/fence/agents/lib/fencing.py.py b/fence/agents/lib/fencing.py.py
|
|
|
182b9e |
index a570203..c8b9bda 100644
|
|
|
182b9e |
--- a/fence/agents/lib/fencing.py.py
|
|
|
182b9e |
+++ b/fence/agents/lib/fencing.py.py
|
|
|
182b9e |
@@ -979,7 +979,7 @@ def fence_login(options, re_login_string = "(login\s*: )|(Login Name: )|(userna
|
|
|
182b9e |
syslog.syslog(syslog.LOG_ERR, str(ex))
|
|
|
182b9e |
sys.exit(EC_GENERIC_ERROR)
|
|
|
182b9e |
elif options.has_key("--ssh") and 0 == options.has_key("--identity-file"):
|
|
|
182b9e |
- command = '%s %s %s@%s -p %s' % (SSH_PATH, force_ipvx, options["--username"], options["--ip"], options["--ipport"])
|
|
|
182b9e |
+ command = '%s %s %s@%s -p %s -o PubkeyAuthentication=no' % (SSH_PATH, force_ipvx, options["--username"], options["--ip"], options["--ipport"])
|
|
|
182b9e |
if options.has_key("--ssh-options"):
|
|
|
182b9e |
command += ' ' + options["--ssh-options"]
|
|
|
182b9e |
try:
|