diff options
| author | Thomas Haller <thaller@redhat.com> | 2016-08-24 10:30:24 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2016-08-24 10:59:39 +0200 |
| commit | 9382fb0213e18349f335d2f9d714d9e46a446e83 (patch) | |
| tree | 91b29307e66a5b2ede91e8c4273edc21d8c44b41 | |
| parent | 07e8ddbfd8f55d09c02412e91e44dc19a87e0030 (diff) | |
| download | NetworkManager-9382fb0213e18349f335d2f9d714d9e46a446e83.tar.gz | |
device/team: fix assuming non-NULL team-config in NMDeviceTeam::act_stage1_prepare()
(cherry picked from commit 4f6fd1bf0ed57abe3e208664a4de23ee11c67f57)
| -rw-r--r-- | src/devices/team/nm-device-team.c | 2 |
1 files changed, 1 insertions, 1 deletions
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; } |