fence-agents: RHEL6 - fencing: Do not use public keys when identity-file is not defined

Marek GrĂ¡c marx at fedoraproject.org
Wed Jun 18 16:38:46 UTC 2014


Gitweb:        http://git.fedorahosted.org/git/?p=fence-agents.git;a=commitdiff;h=8fc75f57798be791b13208ac2f2d872c44c70116
Commit:        8fc75f57798be791b13208ac2f2d872c44c70116
Parent:        f49052ae6f385e473e5acc062bee1c2c74159c99
Author:        Marek 'marx' Grac <mgrac at redhat.com>
AuthorDate:    Wed Jun 18 14:42:20 2014 +0200
Committer:     Marek 'marx' Grac <mgrac at redhat.com>
CommitterDate: Wed Jun 18 14:42:20 2014 +0200

fencing: Do not use public keys when identity-file is not defined

Previously, fence agent (ssh) tried to use keys before it asks for password. This lead to a situation
when fence agent did not work correctly as it was waiting for 'Password' which did not occur.

Resolves: rhbz#1048842
Based on: cfd1f7490d7958ee25ad5937c9f2072adaa9862e
---
 fence/agents/lib/fencing.py.py |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/fence/agents/lib/fencing.py.py b/fence/agents/lib/fencing.py.py
index 8c4a19b..775b567 100644
--- a/fence/agents/lib/fencing.py.py
+++ b/fence/agents/lib/fencing.py.py
@@ -908,7 +908,7 @@ def fence_login(options, re_login_string = "(login\s*: )|(Login Name:  )|(userna
 			 	sys.stderr.write(str(ex) + "\n")
 			 	sys.exit(EC_GENERIC_ERROR)
 		elif options.has_key("-x") and 0 == options.has_key("-k"):
-			command = '%s %s %s@%s -p %s' % (SSH_PATH, force_ipvx, options["-l"], options["-a"], options["-u"])
+			command = '%s %s %s@%s -p %s -o PubkeyAuthentication=no' % (SSH_PATH, force_ipvx, options["-l"], options["-a"], options["-u"])
 			if options.has_key("-X"):
 				command += ' ' + options["-X"]
 			try:


More information about the cluster-commits mailing list