From 0ca8ba791f5944b1b6b1a5d5a7fd4fc85683b37f Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Tue, 25 Oct 2011 12:59:35 -0500 Subject: [PATCH] vpn: ensure valid specific object when none was given at activation If the caller passed "/" to indicate that NM should choose the default active connection as the parent of the VPN, make sure we pass that active connection's object path to the VPN for its specific object path instead of leaving it "/". --- src/nm-manager.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/nm-manager.c b/src/nm-manager.c index b09ccebb6f..475344a522 100644 --- a/src/nm-manager.c +++ b/src/nm-manager.c @@ -1992,7 +1992,7 @@ nm_manager_activate_connection (NMManager *manager, vpn_connection = nm_vpn_manager_activate_connection (priv->vpn_manager, connection, device, - specific_object, + nm_act_request_get_active_connection_path (parent_req), TRUE, sender_uid, error);