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

callouts: don't queue the DHCP callout's bus name request (bgo #680041)

Browse Source 
If queueing the name isn't allowed, and two instances that start in
close succession, one instance will fail because it can't claim the
bus name.
This commit is contained in:
Dan Williams
2012-07-16 19:53:04 -05:00
parent 757a34fcdd
commit a03e7fb74f
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
callouts/nm-dhcp-client-action.c
View File

@@ -251,10 +251,7 @@ dbus_init (void)
dbus_connection_set_exit_on_disconnect (connection, FALSE); dbus_connection_set_exit_on_disconnect (connection, FALSE);
dbus_error_init (&error); dbus_error_init (&error);
ret = dbus_bus_request_name (connection, ret = dbus_bus_request_name (connection, NM_DHCP_CLIENT_DBUS_SERVICE, 0, &error);
NM_DHCP_CLIENT_DBUS_SERVICE,
DBUS_NAME_FLAG_DO_NOT_QUEUE,
&error);
if (dbus_error_is_set (&error)) { if (dbus_error_is_set (&error)) {
fprintf (stderr, "Error: Could not acquire the NM DHCP client service. " fprintf (stderr, "Error: Could not acquire the NM DHCP client service. "
"Message: (%s) %s\n", "Message: (%s) %s\n",