From owner-freebsd-bugs@FreeBSD.ORG  Fri Nov 19 10:30:36 2004
Return-Path: <owner-freebsd-bugs@FreeBSD.ORG>
Delivered-To: freebsd-bugs@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id C2B1D16A4CE; Fri, 19 Nov 2004 10:30:36 +0000 (GMT)
Received: from smtp.atlantis.dp.ua (smtp.atlantis.dp.ua [193.108.46.231])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id D876643D5C; Fri, 19 Nov 2004 10:30:34 +0000 (GMT)
	(envelope-from dmitry@atlantis.dp.ua)
Received: from smtp.atlantis.dp.ua (smtp.atlantis.dp.ua [193.108.46.231])
	by smtp.atlantis.dp.ua (8.12.6p2/8.12.6) with ESMTP id iAJAUOKE087379;
	Fri, 19 Nov 2004 12:30:24 +0200 (EET)
	(envelope-from dmitry@atlantis.dp.ua)
Date: Fri, 19 Nov 2004 12:30:24 +0200 (EET)
From: Dmitry Pryanishnikov <dmitry@atlantis.dp.ua>
To: FreeBSD-gnats-submit@FreeBSD.org, freebsd-bugs@FreeBSD.org
In-Reply-To: <200304042250.h34Mo42B049763@freefall.freebsd.org>
Message-ID: <20041119122817.W79080@atlantis.atlantis.dp.ua>
References: <200304042250.h34Mo42B049763@freefall.freebsd.org>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed
Subject: Re: bin/50613: [PATCH] pppd(8) incorrect CBCP response for
 admin-specified number
X-BeenThere: freebsd-bugs@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: Bug reports <freebsd-bugs.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-bugs>,
	<mailto:freebsd-bugs-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-bugs>
List-Post: <mailto:freebsd-bugs@freebsd.org>
List-Help: <mailto:freebsd-bugs-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-bugs>,
	<mailto:freebsd-bugs-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 19 Nov 2004 10:30:36 -0000


Hello!

  Due to changes in cbcp.c my previuos patch won't apply - I've regenerated
it to match cbcp.c version "1.4.2.1 2004/11/18 15:21:41 delphij"

--- cbcp.c.orig	Fri Nov 19 12:17:56 2004
+++ cbcp.c	Fri Nov 19 12:27:34 2004
@@ -345,10 +345,9 @@
      if (cb_type & ( 1 << CB_CONF_ADMIN ) ) {
          syslog(LOG_DEBUG, "cbcp_resp CONF_ADMIN");
          PUTCHAR(CB_CONF_ADMIN, bufp);
-        len = 3 + 1;
+        len = 3;
          PUTCHAR(len , bufp);
          PUTCHAR(5, bufp); /* delay */
-        PUTCHAR(0, bufp);
          cbcp_send(us, CBCP_RESP, buf, len);
          return;
      }
@@ -356,9 +355,8 @@
      if (cb_type & ( 1 << CB_CONF_NO ) ) {
          syslog(LOG_DEBUG, "cbcp_resp CONF_NO");
          PUTCHAR(CB_CONF_NO, bufp);
-        len = 3;
+        len = 2;
          PUTCHAR(len , bufp);
-        PUTCHAR(0, bufp);
          cbcp_send(us, CBCP_RESP, buf, len);
          (*ipcp_protent.open)(us->us_unit);
          return;


Sincerely, Dmitry
-- 
Atlantis ISP, System Administrator
e-mail:  dmitry@atlantis.dp.ua
nic-hdl: LYNX-RIPE