fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-01 16:08:02 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

2007-08-14 Dan Williams <dcbw@redhat.com>

Browse source 
* src/dhcp-manager/nm-dhcp-manager.c
		- (dhclient_run): don't pass -x to dhclient until we figure out if
			it's really needed, get rid of unused xtra_args parameter



git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@2681 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Dan Williams 2007-08-14 18:23:40 +00:00
parent fec13b0ee1
commit 9bcbbb1cca
2 changed files with 12 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2007-08-14 Dan Williams <dcbw@redhat.com>
* src/dhcp-manager/nm-dhcp-manager.c
- (dhclient_run): don't pass -x to dhclient until we figure out if
it's really needed, get rid of unused xtra_args parameter
2007-08-14 Dan Williams <dcbw@redhat.com>
* include/NetworkManagerVPN.h

24
src/dhcp-manager/nm-dhcp-manager.c
View file

@ -569,19 +569,6 @@ error:
}
/*
* nm_dhcp_manager_get_option
*
* Return the requested dhcp item for the given interface
*
*/
static gpointer
nm_dhcp_manager_get_option (NMDHCPDevice *device, const char *key)
{
return g_hash_table_lookup (device->options, key);
}
/*
* dhclient_watch_cb
*
@ -619,7 +606,7 @@ dhclient_child_setup (gpointer user_data G_GNUC_UNUSED)
}
static gboolean
dhclient_run (NMDHCPDevice *device, gchar *xtra_arg)
dhclient_run (NMDHCPDevice *device)
{
const char ** dhclient_binary = NULL;
GPtrArray * dhclient_argv = NULL;
@ -668,10 +655,11 @@ dhclient_run (NMDHCPDevice *device, gchar *xtra_arg)
g_ptr_array_add (dhclient_argv, (gpointer) (*dhclient_binary));
g_ptr_array_add (dhclient_argv, (gpointer) "-d");
g_ptr_array_add (dhclient_argv, (gpointer) "-x");
if (xtra_arg != NULL)
g_ptr_array_add (dhclient_argv, (gpointer) xtra_arg);
#if 0
/* Disable until we figure out what is really needed here */
g_ptr_array_add (dhclient_argv, (gpointer) "-x");
#endif
g_ptr_array_add (dhclient_argv, (gpointer) "-sf"); /* Set script file */
g_ptr_array_add (dhclient_argv, (gpointer) SYSCONFDIR "/NetworkManager/callouts/nm-dhcp-client.action" );
@ -740,7 +728,7 @@ nm_dhcp_manager_begin_transaction (NMDHCPManager *manager,
nm_dhcp_manager_handle_timeout,
device);
dhclient_run (device, NULL);
dhclient_run (device);
return TRUE;
}