On Wed, Oct 13, 2010 at 09:03:58AM +0100, Stuart Henderson wrote:
> On 2010/10/13 09:16, Patrick Lamaiziere wrote:
> > (snapshot 4.8 / amd64)
> >
> > Hello,
> >
> > The restricted bgpd socket example in bgplgsh and bgplg should be
> > updated :
> >
> > http://www.openbsd.org/faq/current.html#20100627
> > 2010/06/27 - bgpd(8) options moved to config
> > bgpd(8) command-line options -s and -r to set the paths of the control
> > socket and the restricted control socket have been replaced with
> > settings in the configuration file.
> [...]
>
> Ok?
Looks good, OK claudio
> Index: etc/bgpd.conf
> ===================================================================
> RCS file: /cvs/src/etc/bgpd.conf,v
> retrieving revision 1.9
> diff -u -p -r1.9 bgpd.conf
> --- etc/bgpd.conf 20 Nov 2009 19:51:05 -0000 1.9
> +++ etc/bgpd.conf 13 Oct 2010 08:02:12 -0000
> @@ -18,6 +18,9 @@ router-id 10.0.0.1
> # log updates
> # network 10.0.1.0/24
>
> +# restricted socket for bgplg(8)
> +# socket "/var/www/logs/bgpd.rsock" restricted
> +
> # neighbors and peers
> group "peering AS65002" {
> remote-as 65002
> Index: usr.bin/bgplg//bgplg.8
> ===================================================================
> RCS file: /cvs/src/usr.bin/bgplg/bgplg.8,v
> retrieving revision 1.7
> diff -u -p -r1.7 bgplg.8
> --- usr.bin/bgplg//bgplg.8 18 May 2010 15:09:34 -0000 1.7
> +++ usr.bin/bgplg//bgplg.8 13 Oct 2010 07:59:27 -0000
> @@ -93,18 +93,17 @@ from within the
> .Xr chroot 2
> environment.
> See
> -.Xr bgpd 8
> +.Xr bgpd.conf 5
> for more information.
> .Pp
> For example,
> -set the following in
> -.Pa /etc/rc.conf.local
> -to start
> +add the following to
> +.Pa /etc/bgpd.conf
> +to have
> .Xr bgpd 8
> -using the second, restricted, control socket:
> -.Pp
> -.Dl bgpd_flags=\&"-r /var/www/logs/bgpd.rsock\&"
> +open a second, restricted, control socket:
> .Pp
> +.Dl socket \&/var/www/logs/bgpd.rsock\&" restricted
> .It
> Start the Apache HyperText Transfer Protocol server.
> See
> Index: usr.bin/bgplg//bgplgsh.8
> ===================================================================
> RCS file: /cvs/src/usr.bin/bgplg/bgplgsh.8,v
> retrieving revision 1.3
> diff -u -p -r1.3 bgplgsh.8
> --- usr.bin/bgplg//bgplgsh.8 31 May 2007 19:20:07 -0000 1.3
> +++ usr.bin/bgplg//bgplgsh.8 13 Oct 2010 07:58:16 -0000
> @@ -63,19 +63,19 @@ for more information about system user m
> Start the Border Gateway Protocol daemon with a second,
> restricted, control socket.
> See
> -.Xr bgpd 8
> +.Xr bgpd.conf 5
> and
> .Xr bgplg 8
> for more information.
> .Pp
> For example,
> -set the following in
> -.Pa /etc/rc.conf.local
> -to start
> +add the following to
> +.Pa /etc/bgpd.conf
> +to have
> .Xr bgpd 8
> -using the second, restricted, control socket:
> +open a second, restricted, control socket:
> .Pp
> -.Dl bgpd_flags=\&"-r /var/www/logs/bgpd.rsock\&"
> +.Dl socket \&/var/www/logs/bgpd.rsock\&" restricted
> .El
> .Sh FILES
> .Bl -tag -width "/var/www/conf/bgpd.rsockXX" -compact
>
--
:wq Claudio
