--- a/fence/agents/lib/fencing.py.py	2017-09-19 12:29:04.158438532 +0200
+++ b/fence/agents/lib/fencing.py.py	2017-09-19 12:48:22.252509114 +0200
@@ -705,11 +705,12 @@
 				continue
 
 			(name, value) = (line + "=").split("=", 1)
-			name = name.replace("-", "_");
 			value = value[:-1]
 
-			if name in mapping_longopt_names:
-				name = mapping_longopt_names[name]
+			if name.replace("-", "_") in mapping_longopt_names:
+				name = mapping_longopt_names[name.replace("-", "_")]
+			elif name.replace("_", "-") in mapping_longopt_names:
+				name = mapping_longopt_names[name.replace("_", "-")]
 
 			if avail_opt.count(name) == 0 and name in ["nodename"]:
 				continue