Re: [PATCH] pppoe: handle service string empty case

[Dan Williams <dcbw redhat com>]

On Fri, 2008-04-04 at 22:27 +0200, Björn Martensen wrote:
> On Fri, 2008-04-04 at 15:55 -0400, Dan Williams wrote:
> > On Tue, 2008-04-01 at 22:56 +0400, Vitja Makarov wrote:
> > > rp-pppoe could be started with empty service string, this fixes the case.
> > 
> > Ah, interesting.  What I've done instead is to make an empty service
> > fail validation of the setting.  I'm curious where that empty service is
> > coming from, since it shouldn't be written into the setting in the first
> > place...  Do you have an empty 'service' item in GConf perhaps?
> > 
> 
> that commit broke svn for me:

Already fixed, sorry.

dan
> 
> > libtool: compile:  gcc -DHAVE_CONFIG_H -I. -I.. -I.. -I../include -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -DDBUS_VERSION_MAJOR=1 -DDBUS_VERSION_MINOR=1 -DDBUS_VERSION_MICRO=20 -DDBUS_API_SUBJECT_TO_CHANGE -DG_DISABLE_DEPRECATED -fPIC -Wall -Werror -std=gnu89 -march=i686 -mtune=generic -O2 -pipe -Wshadow -Wmissing-declarations -Wmissing-prototypes -Wdeclaration-after-statement -Wfloat-equal -Wno-unused-parameter -Wno-sign-compare -MT libnm_util_la-nm-setting-pppoe.lo -MD -MP -MF .deps/libnm_util_la-nm-setting-pppoe.Tpo -c nm-setting-pppoe.c  -fPIC -DPIC -o .libs/libnm_util_la-nm-setting-pppoe.o
> > cc1: warnings being treated as errors
> > nm-setting-pppoe.c: In function 'verify':
> > nm-setting-pppoe.c:27: warning: implicit declaration of function 'strlen'
> > nm-setting-pppoe.c:27: warning: incompatible implicit declaration of built-in function 'strlen'
> > make[2]: *** [libnm_util_la-nm-setting-pppoe.lo] Error 1
> 
> Björn
> 
> 
> > Dan
> > 
> > > Index: src/ppp-manager/nm-ppp-manager.c
> > > ===================================================================
> > > --- src/ppp-manager/nm-ppp-manager.c	(revision 3521)
> > > +++ src/ppp-manager/nm-ppp-manager.c	(working copy)
> > > @@ -509,7 +509,7 @@
> > >  		nm_cmd_line_add_string (cmd, dev_str);
> > >  		g_free (dev_str);
> > > 
> > > -		if (pppoe->service) {
> > > +		if (pppoe->service && *pppoe->service) {
> > >  			nm_cmd_line_add_string (cmd, "rp_pppoe_service");
> > >  			nm_cmd_line_add_string (cmd, pppoe->service);
> > >  		}
> > > _______________________________________________
> > > NetworkManager-list mailing list
> > > NetworkManager-list gnome org
> > > http://mail.gnome.org/mailman/listinfo/networkmanager-list
> > 
> > _______________________________________________
> > NetworkManager-list mailing list
> > NetworkManager-list gnome org
> > http://mail.gnome.org/mailman/listinfo/networkmanager-list