From 43a10279245431ee750f2cff3e5a80e00ad9cd75 Mon Sep 17 00:00:00 2001 From: Paul Mackerras Date: Tue, 22 Mar 2005 09:53:53 +0000 Subject: [PATCH] From Marco D'Itri. This is a fix for #294232. If pppd recognized the peer not to ask for encryption in his initial offer, it refused any further negotiation. This change tells the peer using a ConfNak what encryption options we're able to accept. This makes the peer send a new ConfReq, usually with one of the options we're able to accept. --- pppd/ccp.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pppd/ccp.c b/pppd/ccp.c index fd51952..1f8fd73 100644 --- a/pppd/ccp.c +++ b/pppd/ccp.c @@ -28,7 +28,7 @@ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#define RCSID "$Id: ccp.c,v 1.48 2004/11/13 02:28:15 paulus Exp $" +#define RCSID "$Id: ccp.c,v 1.49 2005/03/22 09:53:53 paulus Exp $" #include #include @@ -1158,8 +1158,11 @@ ccp_reqci(f, p, lenp, dont_nak) } } else { /* Neither are set. */ - newret = CONFREJ; - break; + /* We cannot accept this. */ + newret = CONFNAK; + /* Give the peer our idea of what can be used, + so it can choose and confirm */ + ho->mppe = ao->mppe; } /* rebuild the opts */ -- 2.11.4.GIT