From owner-cvs-all@FreeBSD.ORG Mon May 28 05:24:29 2007 Return-Path: X-Original-To: cvs-all@freebsd.org Delivered-To: cvs-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id AD7E716A46D; Mon, 28 May 2007 05:24:29 +0000 (UTC) (envelope-from novel@FreeBSD.org) Received: from viefep18-int.chello.at (viefep18-int.chello.at [213.46.255.22]) by mx1.freebsd.org (Postfix) with ESMTP id 65C4A13C455; Mon, 28 May 2007 05:24:28 +0000 (UTC) (envelope-from novel@FreeBSD.org) Received: from novel.renet.ru ([82.116.33.234]) by viefep23-int.chello.at (InterMail vM.7.08.02.00 201-2186-121-20061213) with ESMTP id <20070528045149.SMBY7724.viefep23-int.chello.at@novel.renet.ru>; Mon, 28 May 2007 06:51:49 +0200 Date: Mon, 28 May 2007 08:53:06 +0400 From: Roman Bogorodskiy To: "Bjoern A. Zeeb" Message-ID: <20070528045306.GA987@underworld.novel.ru> References: <200705251345.l4PDjoEW059652@repoman.freebsd.org> <20070527233522.E13311@maildrop.int.zabbadoz.net> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="rS8CxjVDS/+yyDmU" Content-Disposition: inline In-Reply-To: <20070527233522.E13311@maildrop.int.zabbadoz.net> X-PGP: http://people.freebsd.org/~novel/novel.key.asc Cc: cvs-src@freebsd.org, src-committers@freebsd.org, cvs-all@freebsd.org Subject: Re: cvs commit: src/usr.sbin/ppp command.c ppp.8.m4 radius.c radius.h X-BeenThere: cvs-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CVS commit messages for the entire tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 28 May 2007 05:24:29 -0000 --rS8CxjVDS/+yyDmU Content-Type: multipart/mixed; boundary="1yeeQ81UyVL57Vl7" Content-Disposition: inline --1yeeQ81UyVL57Vl7 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Bjoern A. Zeeb wrote: > On Fri, 25 May 2007, Roman Bogorodskiy wrote: >=20 > >novel 2007-05-25 13:45:49 UTC > > > > FreeBSD src repository (ports committer) > > > > Modified files: > > usr.sbin/ppp command.c ppp.8.m4 radius.c radius.h > > Log: > > Add a new option for ppp.conf: rad_port_id. It allows to > > change the way of what ppp submits to the RADIUS server > > as NAS-Port-Id. Possible options are: the PID of the process > > owning the corresponding interface, tun(4) interface number, > > interface index (as it would get returned by if_nametoindex(3)), > > or it's possible to keep the default behavior. Check the ppp(8) > > manual page for details. > > > > PR: bin/112764 > > Submitted by: novel (myself) > > Reviewed by: flz > > Approved by: flz > > MFC after: 1 month > > > > Revision Changes Path > > 1.307 +27 -1 src/usr.sbin/ppp/command.c >=20 > @@ -144,6 +144,7 @@ > #define VAR_IPV6CPRETRY 37 > #define VAR_RAD_ALIVE 38 > #define VAR_PPPOE 39 > +#define VAR_PORT_ID 40 >=20 > Was there some reason the VAR_ and the NEG_ defines were in > different ranges? If so there is a conflict now and maybe we > should move the NEG_ defines to 128+? I cannot see any conflicts, however it doesn't mean it could not exist. Anyway, it seems to be a good idea to move NEG_ to 128+ to avoid possible confusing and have a room for other 'set' we would want to add in the future. A simple patch attached. =20 > > 1.326 +20 -1 src/usr.sbin/ppp/ppp.8.m4 > > 1.54 +27 -10 src/usr.sbin/ppp/radius.c > > 1.22 +6 -0 src/usr.sbin/ppp/radius.h > > >=20 > --=20 > Bjoern A. Zeeb bzeeb at Zabbadoz dot NeT > _______________________________________________ > cvs-all@freebsd.org mailing list > http://lists.freebsd.org/mailman/listinfo/cvs-all > To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org" Roman Bogorodskiy --1yeeQ81UyVL57Vl7 Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="ppp_neg_var_overlap.diff" Content-Transfer-Encoding: quoted-printable ? ppp ? ppp.8 ? ppp.8.gz Index: command.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /home/ncvs/src/usr.sbin/ppp/command.c,v retrieving revision 1.307 diff -u -r1.307 command.c --- command.c 25 May 2007 13:45:48 -0000 1.307 +++ command.c 28 May 2007 04:49:55 -0000 @@ -151,23 +151,23 @@ #define NEG_MYMASK (2) =20 /* ``accept|deny|disable|enable'' values */ -#define NEG_ACFCOMP 40 -#define NEG_CHAP05 41 -#define NEG_CHAP80 42 -#define NEG_CHAP80LM 43 -#define NEG_DEFLATE 44 -#define NEG_DNS 45 -#define NEG_ECHO 46 -#define NEG_ENDDISC 47 -#define NEG_LQR 48 -#define NEG_PAP 49 -#define NEG_PPPDDEFLATE 50 -#define NEG_PRED1 51 -#define NEG_PROTOCOMP 52 -#define NEG_SHORTSEQ 53 -#define NEG_VJCOMP 54 -#define NEG_MPPE 55 -#define NEG_CHAP81 56 +#define NEG_ACFCOMP 168 +#define NEG_CHAP05 169 +#define NEG_CHAP80 170 +#define NEG_CHAP80LM 171 +#define NEG_DEFLATE 172 +#define NEG_DNS 173 +#define NEG_ECHO 174 +#define NEG_ENDDISC 175 +#define NEG_LQR 176 +#define NEG_PAP 177 +#define NEG_PPPDDEFLATE 178 +#define NEG_PRED1 179 +#define NEG_PROTOCOMP 180 +#define NEG_SHORTSEQ 181 +#define NEG_VJCOMP 182 +#define NEG_MPPE 183 +#define NEG_CHAP81 184 =20 const char Version[] =3D "3.4.2"; =20 --1yeeQ81UyVL57Vl7-- --rS8CxjVDS/+yyDmU Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.5 (FreeBSD) iQCVAwUBRlpgMYB0WzgdqspGAQLIPQQAvtO4akWfX70A6lcNPBDNpzWaxj/tFims mcocbihEaMx9QxRy72lsa9yqzO0LT6EVIzIfGDUERyeQeH3IcM+++BB3kg7AD4Ps VUCAV9iFP8u1GjuCNNUGPUewVTA7M/yv1KmFEeiX0lxSRKAn6htSfx2lap+4NMYe Rfq5goVo6JQ= =mxNo -----END PGP SIGNATURE----- --rS8CxjVDS/+yyDmU--