From 22da78db6139ea8963010f10ae7cacfacf91c936 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Aug 06 2019 10:55:20 +0000
Subject: import fence-virt-0.3.2-14.el7


---

diff --git a/SOURCES/bz1600566-fence_virt-dont-report-success-incorrect-parameter.patch b/SOURCES/bz1600566-fence_virt-dont-report-success-incorrect-parameter.patch
new file mode 100644
index 0000000..6c541f9
--- /dev/null
+++ b/SOURCES/bz1600566-fence_virt-dont-report-success-incorrect-parameter.patch
@@ -0,0 +1,35 @@
+From 83e507cd236c304ce6b95b2ba52d3894f8002dc8 Mon Sep 17 00:00:00 2001
+From: Oyvind Albrigtsen <oalbrigt@redhat.com>
+Date: Fri, 9 Nov 2018 13:10:29 +0100
+Subject: [PATCH] fence_virt: dont report success for incorrect parameters
+
+---
+ client/main.c    | 2 +-
+ client/options.c | 1 +
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/client/main.c b/client/main.c
+index 8e94093..a3135e3 100644
+--- a/client/main.c
++++ b/client/main.c
+@@ -112,7 +112,7 @@ main(int argc, char **argv)
+ 		args.mode = MODE_VSOCK;
+ 
+ 	if (args.flags & F_ERR) {
+-        if (args.op != FENCE_VALIDATEALL)
++		if (args.op != FENCE_VALIDATEALL)
+ 			args_usage(argv[0], my_options, (argc == 1));
+ 		exit(1);
+ 	}
+diff --git a/client/options.c b/client/options.c
+index a3f321b..4b5ed56 100644
+--- a/client/options.c
++++ b/client/options.c
+@@ -904,6 +904,7 @@ args_get_stdin(const char *optstr, fence_virt_args_t *args)
+ 				"parse warning: "
+ 				"illegal variable '%s' on line %d\n", name,
+ 				line);
++			args->flags |= F_ERR;
+ 			continue;
+ 		}
+ 
diff --git a/SPECS/fence-virt.spec b/SPECS/fence-virt.spec
index bfeccdf..f56445c 100644
--- a/SPECS/fence-virt.spec
+++ b/SPECS/fence-virt.spec
@@ -1,6 +1,6 @@
 Name:		fence-virt
 Version:	0.3.2
-Release:	13%{?dist}
+Release:	14%{?dist}
 Summary:	A pluggable fencing framework for virtual machines
 Group:		System Environment/Base
 License:	GPLv2+
@@ -25,6 +25,7 @@ Patch9: bz1334170-cleanup_documentation_of_the_tcp_listener.patch
 Patch10: bz1092531-enable_hardening.patch
 Patch11: bz1447700-virt_add_support_for_the_validate_all_status.patch
 Patch12: bz1384181-make_the_libvirt_backend_survive_libvirtd.patch
+Patch13: bz1600566-fence_virt-dont-report-success-incorrect-parameter.patch
 
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
@@ -110,6 +111,7 @@ machines on a desktop.
 %patch10 -p1 -b .bz1092531.1
 %patch11 -p1 -b .bz1447700.1
 %patch12 -p1 -b .bz1384181.1
+%patch13 -p1 -F1
 
 %build
 %ifarch s390 s390x sparcv9 sparc64
@@ -213,6 +215,10 @@ fi
 %{_libdir}/%{name}/libvirt.so
 
 %changelog
+* Tue Jan 22 2019 Oyvind Albrigtsen <oalbrigt@redhat.com> - 0.3.2-14
+- fence_xvm/fence_virt: dont report success incorrect parameter
+  Resolves: rhbz#1600566
+
 * Wed Aug 09 2017 Ryan McCabe <rmccabe@redhat.com> - 0.3.2-13
 - fence_virtd: Make the libvirt backend survive libvirtd restarts
   Resolves: rhbz#1384181