diff options
| author | Michael Biebl <biebl@debian.org> | 2015-12-24 00:25:15 +0100 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2015-12-24 00:25:15 +0100 |
| commit | 95fc418c29eaf71c43ee0dddc4515580b9ec1461 (patch) | |
| tree | c785190da048e63173bd573d7e8c565f3d28488d /src/nm-iface-helper.c | |
| parent | 46654959ce8acc3b92a92e931920365c3b2dab0d (diff) | |
| parent | 54f6333410ffd570e62717d9e77c5c987175e397 (diff) | |
Merge tag 'upstream/1.0.10'
Upstream version 1.0.10
Diffstat (limited to 'src/nm-iface-helper.c')
| -rw-r--r-- | src/nm-iface-helper.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/nm-iface-helper.c b/src/nm-iface-helper.c index 18966c57..25bde8ed 100644 --- a/src/nm-iface-helper.c +++ b/src/nm-iface-helper.c @@ -327,7 +327,6 @@ int main (int argc, char *argv[]) { char *bad_domains = NULL; - gs_unref_object NMDhcpManager *dhcp_mgr = NULL; GError *error = NULL; gboolean wrote_pidfile = FALSE; gs_free char *pidfile = NULL; @@ -437,11 +436,7 @@ main (int argc, char *argv[]) if (global_opt.dhcp4_address) { nm_platform_sysctl_set (NM_PLATFORM_GET, nm_utils_ip4_property_path (global_opt.ifname, "promote_secondaries"), "1"); - /* Initialize DHCP manager */ - dhcp_mgr = nm_dhcp_manager_get (); - g_assert (dhcp_mgr != NULL); - - dhcp4_client = nm_dhcp_manager_start_ip4 (dhcp_mgr, + dhcp4_client = nm_dhcp_manager_start_ip4 (nm_dhcp_manager_get (), global_opt.ifname, ifindex, hwaddr, |