colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dhcp: fix uninitialized variable usage with dhcp3

Browse Source
This commit is contained in:
Martin Pitt
2010-10-06 17:12:10 -05:00
committed by Dan Williams
parent c35a763c17
commit 61e86600d5
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/dhcp-manager/nm-dhcp-dhclient.c
View File

@@ -512,6 +512,8 @@ dhclient_start (NMDHCPClient *client,
uuid = nm_dhcp_client_get_uuid (client); uuid = nm_dhcp_client_get_uuid (client);
ipv6 = nm_dhcp_client_get_ipv6 (client); ipv6 = nm_dhcp_client_get_ipv6 (client);
log_domain = ipv6 ? LOGD_DHCP6 : LOGD_DHCP4;
#if defined(DHCLIENT_V3) #if defined(DHCLIENT_V3)
if (ipv6) { if (ipv6) {
nm_log_warn (log_domain, "(%s): ISC dhcp3 does not support IPv6", iface); nm_log_warn (log_domain, "(%s): ISC dhcp3 does not support IPv6", iface);
@@ -521,8 +523,6 @@ dhclient_start (NMDHCPClient *client,
g_return_val_if_fail (ip_opt != NULL, -1); g_return_val_if_fail (ip_opt != NULL, -1);
#endif #endif
log_domain = ipv6 ? LOGD_DHCP6 : LOGD_DHCP4;
priv->pid_file = g_strdup_printf (LOCALSTATEDIR "/run/dhclient%s-%s.pid", priv->pid_file = g_strdup_printf (LOCALSTATEDIR "/run/dhclient%s-%s.pid",
ipv6 ? "6" : "", ipv6 ? "6" : "",
iface); iface);