Merge commit '9b78f26a' into sle15-sp1

- addrconf: fix fallback-lease drop (bsc#1220996)
- Replace "nvme show-nbft" with "nvme nbft show" (bsc#1221358)
- hide secrets in debug log (bsc#1221194)

client/ifdown.c

@@ -123,7 +123,7 @@ ni_do_ifdown(int argc, char **argv)
 	ni_ifworker_array_t ifmarked = NI_IFWORKER_ARRAY_INIT;
 	ni_string_array_t ifnames = NI_STRING_ARRAY_INIT;
 	unsigned int nmarked, max_state = NI_FSM_STATE_DEVICE_DOWN;
-	unsigned int seconds = NI_IFWORKER_DEFAULT_TIMEOUT;
+	unsigned int seconds = 0;
 	ni_stringbuf_t sb = NI_STRINGBUF_INIT_DYNAMIC;
 	ni_tristate_t opt_release = NI_TRISTATE_DEFAULT;
 	ni_fsm_t *fsm;
@@ -223,9 +223,10 @@ ni_do_ifdown(int argc, char **argv)
 	ifmarker.target_range.min = NI_FSM_STATE_NONE;
 	ifmarker.target_range.max = max_state;
 
-	fsm->worker_timeout = ni_fsm_find_max_timeout(fsm,
-					NI_TIMEOUT_FROM_SEC(seconds));
-
+	if (seconds)
+		fsm->worker_timeout = NI_TIMEOUT_FROM_SEC(seconds);
+	else
+		fsm->worker_timeout = NI_IFWORKER_DEFAULT_TIMEOUT;
 	if (fsm->worker_timeout == NI_IFWORKER_INFINITE_TIMEOUT)
 		ni_debug_application("wait for interfaces infinitely");
 	else

src/fsm.c

@@ -2058,17 +2058,17 @@ ni_ifworker_set_config_origin(ni_ifworker_t *w, const char *new_origin)
 static void
 ni_ifworker_extra_waittime_from_xml(ni_ifworker_t *w)
 {
-	unsigned int extra_timeout = 0;
+	unsigned int extra_waittime = 0;
 	const xml_node_t *brnode;
 
 	if (!w || xml_node_is_empty(w->config.node))
 		return;
 
 	/* Adding bridge dependent values (STP, Forwarding times) */
 	if ((brnode = xml_node_get_child(w->config.node, "bridge")))
-		extra_timeout += ni_bridge_waittime_from_xml(brnode);
+		extra_waittime += ni_bridge_waittime_from_xml(brnode);
 
-	w->extra_waittime = (extra_timeout*1000);
+	w->extra_waittime = extra_waittime;
 }
 
 ni_iftype_t
@@ -6119,26 +6119,21 @@ ni_fsm_user_prompt_default(const ni_fsm_prompt_t *p, xml_node_t *node, void *use
 ni_timeout_t
 ni_fsm_find_max_timeout(ni_fsm_t *fsm, ni_timeout_t timeout)
 {
+	ni_timeout_t max = timeout;
 	unsigned int i;
 
 	if (!fsm || timeout >= NI_IFWORKER_INFINITE_TIMEOUT)
 		return NI_IFWORKER_INFINITE_TIMEOUT;
 
 	for (i = 0; i < fsm->workers.count; i++) {
 		ni_ifworker_t *w = fsm->workers.data[i];
-		ni_timeout_t max, add;
+		ni_timeout_t add;
 
-		add = min_t(ni_timeout_t,
-				NI_TIMEOUT_FROM_SEC(w->extra_waittime),
-				NI_IFWORKER_INFINITE_TIMEOUT);
-		max = max_t(ni_timeout_t, timeout,
-				fsm->worker_timeout + add);
-
-		timeout = min_t(ni_timeout_t, max,
-				NI_IFWORKER_INFINITE_TIMEOUT);
+		add = NI_TIMEOUT_FROM_SEC(w->extra_waittime);
+		max = max_t(ni_timeout_t, max, timeout + add);
 	}
 
-	return timeout;
+	return min_t(ni_timeout_t, max, NI_IFWORKER_INFINITE_TIMEOUT);
 }
 
 void