Re: [PATCH] nm-pppd-plugin: fix crash

2016-04-14 Thread Thomas Haller
On Thu, 2016-04-14 at 16:48 +0200, Lubomir Rintel wrote:
> On Wed, 2016-04-13 at 22:53 +0200, Thomas Haller wrote:
> > 
> > Thank you. A few lines before there is also:
> > 
> >      bus_name = getenv ("NM_DBUS_SERVICE_PPTP");
> >  if (!bus_name)
> >   bus_name = NM_DBUS_SERVICE_PPTP;
> > 
> > 
> > thus, this should be changed too.
> That one looks correct to me?


Oh, right.

Never mind.


Thomas

signature.asc
Description: This is a digitally signed message part
___
networkmanager-list mailing list
networkmanager-list@gnome.org
https://mail.gnome.org/mailman/listinfo/networkmanager-list


Re: [PATCH] nm-pppd-plugin: fix crash

2016-04-14 Thread Lubomir Rintel
On Wed, 2016-04-13 at 22:53 +0200, Thomas Haller wrote:
> On Wed, 2016-04-13 at 21:43 +0300, Mikhail Efremov wrote:
> > 
> > A bus name is not an object path.
> > Fix crash introduced by commit
> > 17ae85788987ef1f7c92a251c535312163144c33.
> > ---
> >  src/nm-pptp-pppd-plugin.c | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > diff --git a/src/nm-pptp-pppd-plugin.c b/src/nm-pptp-pppd-plugin.c
> > index 2b8c819..4567fcc 100644
> > --- a/src/nm-pptp-pppd-plugin.c
> > +++ b/src/nm-pptp-pppd-plugin.c
> > @@ -318,8 +318,8 @@ plugin_init (void)
> >     proxy = g_dbus_proxy_new_sync (bus,
> >        G_DBUS_PROXY_FLAGS_DO_NOT_L
> > OA
> > D_PROPERTIES,
> >        NULL,
> > -      NM_DBUS_SERVICE_PPTP_PPP,
> >        bus_name,
> > +      NM_DBUS_PATH_PPTP_PPP,
> >        NM_DBUS_INTERFACE_PPTP_PPP,
> >        NULL, );
> >     g_object_unref (bus);
> 

Thank you, applied.

> Hi Mikhail,
> 
> 
> 
> Thank you. A few lines before there is also:
> 
>      bus_name = getenv ("NM_DBUS_SERVICE_PPTP");
>  if (!bus_name)
>   bus_name = NM_DBUS_SERVICE_PPTP;
> 
> 
> thus, this should be changed too.

That one looks correct to me?

> 
> 
> [[ I leave this to Lubomir (CC'ed) ]]
> 
> 
> Thomas

Lubo
___
networkmanager-list mailing list
networkmanager-list@gnome.org
https://mail.gnome.org/mailman/listinfo/networkmanager-list


Re: [PATCH] nm-pppd-plugin: fix crash

2016-04-13 Thread Thomas Haller
On Wed, 2016-04-13 at 21:43 +0300, Mikhail Efremov wrote:
> A bus name is not an object path.
> Fix crash introduced by commit
> 17ae85788987ef1f7c92a251c535312163144c33.
> ---
>  src/nm-pptp-pppd-plugin.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/src/nm-pptp-pppd-plugin.c b/src/nm-pptp-pppd-plugin.c
> index 2b8c819..4567fcc 100644
> --- a/src/nm-pptp-pppd-plugin.c
> +++ b/src/nm-pptp-pppd-plugin.c
> @@ -318,8 +318,8 @@ plugin_init (void)
>   proxy = g_dbus_proxy_new_sync (bus,
>      G_DBUS_PROXY_FLAGS_DO_NOT_LOA
> D_PROPERTIES,
>      NULL,
> -    NM_DBUS_SERVICE_PPTP_PPP,
>      bus_name,
> +    NM_DBUS_PATH_PPTP_PPP,
>      NM_DBUS_INTERFACE_PPTP_PPP,
>      NULL, );
>   g_object_unref (bus);


Hi Mikhail,



Thank you. A few lines before there is also:

     bus_name = getenv ("NM_DBUS_SERVICE_PPTP");
 if (!bus_name)
  bus_name = NM_DBUS_SERVICE_PPTP;


thus, this should be changed too.


[[ I leave this to Lubomir (CC'ed) ]]


Thomas

signature.asc
Description: This is a digitally signed message part
___
networkmanager-list mailing list
networkmanager-list@gnome.org
https://mail.gnome.org/mailman/listinfo/networkmanager-list


[PATCH] nm-pppd-plugin: fix crash

2016-04-13 Thread Mikhail Efremov
A bus name is not an object path.
Fix crash introduced by commit 17ae85788987ef1f7c92a251c535312163144c33.
---
 src/nm-pptp-pppd-plugin.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/nm-pptp-pppd-plugin.c b/src/nm-pptp-pppd-plugin.c
index 2b8c819..4567fcc 100644
--- a/src/nm-pptp-pppd-plugin.c
+++ b/src/nm-pptp-pppd-plugin.c
@@ -318,8 +318,8 @@ plugin_init (void)
proxy = g_dbus_proxy_new_sync (bus,
   
G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES,
   NULL,
-  NM_DBUS_SERVICE_PPTP_PPP,
   bus_name,
+  NM_DBUS_PATH_PPTP_PPP,
   NM_DBUS_INTERFACE_PPTP_PPP,
   NULL, );
g_object_unref (bus);
-- 
2.7.4

___
networkmanager-list mailing list
networkmanager-list@gnome.org
https://mail.gnome.org/mailman/listinfo/networkmanager-list