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

2006-02-05 Dan Williams <dcbw@redhat.com>

Browse Source 
* src/dhcp-manager/nm-dhcp-manager.c
		- Loose a commit race with Robert; make sure size check
			uses size of DHCP_SERVICE_LEN, not hardcoded 15


git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@1448 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Dan Williams
2006-02-05 16:07:12 +00:00
parent 5aba504db7
commit 2926a9777d
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@@ -1,3 +1,9 @@
2006-02-05 Dan Williams <dcbw@redhat.com>
* src/dhcp-manager/nm-dhcp-manager.c
- Loose a commit race with Robert; make sure size check
uses size of DHCP_SERVICE_LEN, not hardcoded 15
2006-02-05 Robert Love <rml@novell.com> 2006-02-05 Robert Love <rml@novell.com>
Patch by Christoph Brill <chrisbrill@gmx.net> Patch by Christoph Brill <chrisbrill@gmx.net>

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

@@ -37,6 +37,7 @@ struct NMDHCPManager
{ {
NMData * data; NMData * data;
gboolean running; gboolean running;
size_t dhcp_sn_len;
}; };
@@ -116,6 +117,7 @@ NMDHCPManager * nm_dhcp_manager_new (NMData *data)
manager = g_malloc0 (sizeof (NMDHCPManager)); manager = g_malloc0 (sizeof (NMDHCPManager));
manager->data = data; manager->data = data;
manager->running = dbus_bus_name_has_owner (manager->data->dbus_connection, DHCP_SERVICE_NAME, NULL); manager->running = dbus_bus_name_has_owner (manager->data->dbus_connection, DHCP_SERVICE_NAME, NULL);
manager->dhcp_sn_len = strlen (DHCP_SERVICE_NAME);
if (manager->running && (owner = get_name_owner (data->dbus_connection, DHCP_SERVICE_NAME))) if (manager->running && (owner = get_name_owner (data->dbus_connection, DHCP_SERVICE_NAME)))
{ {
@@ -639,7 +641,7 @@ gboolean nm_dhcp_manager_process_signal (NMDHCPManager *manager, DBusMessage *me
if (!(interface = dbus_message_get_interface (message))) if (!(interface = dbus_message_get_interface (message)))
return FALSE; return FALSE;
/* Ignore non-DHCP related messages */ /* Ignore non-DHCP related messages */
if (strncmp (interface, DHCP_SERVICE_NAME, 15)) if (strncmp (interface, DHCP_SERVICE_NAME, manager->dhcp_sn_len))
return FALSE; return FALSE;
#if 0 #if 0