From 9382fb0213e18349f335d2f9d714d9e46a446e83 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Wed, 24 Aug 2016 10:30:24 +0200 Subject: device/team: fix assuming non-NULL team-config in NMDeviceTeam::act_stage1_prepare() (cherry picked from commit 4f6fd1bf0ed57abe3e208664a4de23ee11c67f57) --- src/devices/team/nm-device-team.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/devices/team/nm-device-team.c b/src/devices/team/nm-device-team.c index d32d3cc9b0..09eefe7014 100644 --- a/src/devices/team/nm-device-team.c +++ b/src/devices/team/nm-device-team.c @@ -575,7 +575,7 @@ act_stage1_prepare (NMDevice *device, NMDeviceStateReason *reason) * have a PID, then we must fail. */ cfg = teamdctl_config_get_raw (priv->tdc); - if (cfg && strcmp (cfg, nm_setting_team_get_config (s_team)) == 0) { + if (cfg && nm_streq0 (cfg, nm_setting_team_get_config (s_team))) { _LOGD (LOGD_TEAM, "using existing matching teamd config"); return NM_ACT_STAGE_RETURN_SUCCESS; } -- cgit v1.2.1