Fix: sbd-inquisitor: Do not use watchdog if the conflicting options "…

…-W" and "-w /dev/null" are both supplied
ClusterLabs · Jul 4, 2017 · 68c73ec · 68c73ec
1 parent c527ba9
commit 68c73ec
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/sbd-inquisitor.c b/src/sbd-inquisitor.c
@@ -1019,11 +1019,11 @@ int main(int argc, char **argv, char **envp)
 		}
 	}
 
-	if (W_count > 0) {
-            watchdog_use = arg_enabled(W_count);
-
-	} else if(watchdogdev == NULL || strcmp(watchdogdev, "/dev/null") == 0) {
+	if (watchdogdev == NULL || strcmp(watchdogdev, "/dev/null") == 0) {
             watchdog_use = 0;
+
+	} else if (W_count > 0) {
+            watchdog_use = arg_enabled(W_count);
         }
 
 	if (watchdog_use) {