diff options
| author | Sjoerd Simons <sjoerd@luon.net> | 2013-10-25 21:21:07 +0200 |
|---|---|---|
| committer | Sjoerd Simons <sjoerd@luon.net> | 2013-10-25 21:21:07 +0200 |
| commit | e83d1de9b746dbc078ac1cf45f1798e1bc6b7e2f (patch) | |
| tree | c36a40d79a5ae7d2bbca7d240d0a6f664049b435 /src/nm-dispatcher.c | |
| parent | 26283b4c9e5035574a6c168003e7f1da53a8f32a (diff) | |
| parent | a4256940da049f91bbbea5e53e469a59ea9c10f7 (diff) | |
Merge tag 'upstream/0.9.8.8' into experimental
Upstream version 0.9.8.8
Diffstat (limited to 'src/nm-dispatcher.c')
| -rw-r--r-- | src/nm-dispatcher.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/nm-dispatcher.c b/src/nm-dispatcher.c index 61dfd7c0..12cd0f0a 100644 --- a/src/nm-dispatcher.c +++ b/src/nm-dispatcher.c @@ -316,7 +316,7 @@ _dispatcher_call (DispatcherAction action, device_dhcp4_props, device_dhcp6_props); if (vpn_iface) - fill_vpn_props (vpn_ip4_config, NULL, vpn_ip4_props, vpn_ip6_props); + fill_vpn_props (vpn_ip4_config, vpn_ip6_config, vpn_ip4_props, vpn_ip6_props); } info = g_malloc0 (sizeof (*info)); |