Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/external/bsd/ppp merge conflicts
details: https://anonhg.NetBSD.org/src/rev/84bf9aae0539
branches: trunk
changeset: 803400:84bf9aae0539
user: christos <christos%NetBSD.org@localhost>
date: Sat Oct 25 19:06:33 2014 +0000
description:
merge conflicts
diffstat:
external/bsd/ppp/dist/chat/chat.8 | 2 +-
external/bsd/ppp/dist/chat/chat.c | 2 +-
external/bsd/ppp/dist/pppd/auth.c | 4 +-
external/bsd/ppp/dist/pppd/cbcp.c | 4 +-
external/bsd/ppp/dist/pppd/cbcp.h | 2 +-
external/bsd/ppp/dist/pppd/ccp.c | 4 +-
external/bsd/ppp/dist/pppd/ccp.h | 2 +-
external/bsd/ppp/dist/pppd/chap-md5.c | 4 +-
external/bsd/ppp/dist/pppd/chap-md5.h | 2 +-
external/bsd/ppp/dist/pppd/chap-new.c | 4 +-
external/bsd/ppp/dist/pppd/chap-new.h | 2 +-
external/bsd/ppp/dist/pppd/chap_ms.c | 6 +-
external/bsd/ppp/dist/pppd/chap_ms.h | 2 +-
external/bsd/ppp/dist/pppd/demand.c | 4 +-
external/bsd/ppp/dist/pppd/eap.c | 4 +-
external/bsd/ppp/dist/pppd/eap.h | 2 +-
external/bsd/ppp/dist/pppd/ecp.c | 4 +-
external/bsd/ppp/dist/pppd/ecp.h | 2 +-
external/bsd/ppp/dist/pppd/eui64.c | 4 +-
external/bsd/ppp/dist/pppd/eui64.h | 2 +-
external/bsd/ppp/dist/pppd/fsm.c | 4 +-
external/bsd/ppp/dist/pppd/fsm.h | 2 +-
external/bsd/ppp/dist/pppd/ipcp.c | 23 +++-
external/bsd/ppp/dist/pppd/ipcp.h | 2 +-
external/bsd/ppp/dist/pppd/ipv6cp.c | 62 ++---------
external/bsd/ppp/dist/pppd/ipv6cp.h | 4 +-
external/bsd/ppp/dist/pppd/ipxcp.c | 4 +-
external/bsd/ppp/dist/pppd/ipxcp.h | 2 +-
external/bsd/ppp/dist/pppd/lcp.c | 4 +-
external/bsd/ppp/dist/pppd/lcp.h | 2 +-
external/bsd/ppp/dist/pppd/magic.c | 4 +-
external/bsd/ppp/dist/pppd/magic.h | 2 +-
external/bsd/ppp/dist/pppd/main.c | 4 +-
external/bsd/ppp/dist/pppd/mppe.h | 2 +-
external/bsd/ppp/dist/pppd/multilink.c | 4 +-
external/bsd/ppp/dist/pppd/options.c | 19 ++-
external/bsd/ppp/dist/pppd/patchlevel.h | 6 +-
external/bsd/ppp/dist/pppd/pathnames.h | 2 +-
external/bsd/ppp/dist/pppd/pppcrypt.c | 4 +-
external/bsd/ppp/dist/pppd/pppcrypt.h | 2 +-
external/bsd/ppp/dist/pppd/pppd.8 | 2 +-
external/bsd/ppp/dist/pppd/pppd.h | 5 +-
external/bsd/ppp/dist/pppd/session.c | 4 +-
external/bsd/ppp/dist/pppd/session.h | 2 +-
external/bsd/ppp/dist/pppd/tty.c | 8 +-
external/bsd/ppp/dist/pppd/upap.c | 4 +-
external/bsd/ppp/dist/pppd/upap.h | 2 +-
external/bsd/ppp/dist/pppd/utils.c | 6 +-
external/bsd/ppp/dist/pppdump/deflate.c | 4 +-
external/bsd/ppp/dist/pppstats/pppstats.c | 4 +-
external/bsd/ppp/ppp2netbsd | 9 +-
external/bsd/ppp/usr.sbin/pppd/sys-bsd.c | 163 +++++++++++++++++++++++------
52 files changed, 263 insertions(+), 170 deletions(-)
diffs (truncated from 1172 to 300 lines):
diff -r de130c95da6d -r 84bf9aae0539 external/bsd/ppp/dist/chat/chat.8
--- a/external/bsd/ppp/dist/chat/chat.8 Sat Oct 25 18:47:46 2014 +0000
+++ b/external/bsd/ppp/dist/chat/chat.8 Sat Oct 25 19:06:33 2014 +0000
@@ -1,4 +1,4 @@
-.\" $NetBSD: chat.8,v 1.2 2013/11/28 22:33:42 christos Exp $
+.\" NetBSD
.\" manual page [] for chat 1.8
.\" Id: chat.8,v 1.11 2004/11/13 12:22:49 paulus Exp
.\" SH section heading
diff -r de130c95da6d -r 84bf9aae0539 external/bsd/ppp/dist/chat/chat.c
--- a/external/bsd/ppp/dist/chat/chat.c Sat Oct 25 18:47:46 2014 +0000
+++ b/external/bsd/ppp/dist/chat/chat.c Sat Oct 25 19:06:33 2014 +0000
@@ -91,7 +91,7 @@
static const char rcsid[] = "Id: chat.c,v 1.30 2004/01/17 05:47:55 carlsonj Exp ";
#endif
#else
-__RCSID("$NetBSD: chat.c,v 1.3 2013/12/07 20:24:35 christos Exp $");
+__RCSID("NetBSD: chat.c,v 1.2 2013/11/28 22:33:42 christos Exp ");
#endif
#include <stdio.h>
diff -r de130c95da6d -r 84bf9aae0539 external/bsd/ppp/dist/pppd/auth.c
--- a/external/bsd/ppp/dist/pppd/auth.c Sat Oct 25 18:47:46 2014 +0000
+++ b/external/bsd/ppp/dist/pppd/auth.c Sat Oct 25 19:06:33 2014 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: auth.c,v 1.2 2013/11/28 22:33:42 christos Exp $ */
+/* NetBSD */
/*
* auth.c - PPP authentication and phase control.
@@ -75,7 +75,7 @@
#define RCSID "Id: auth.c,v 1.117 2008/07/01 12:27:56 paulus Exp "
static const char rcsid[] = RCSID;
#else
-__RCSID("$NetBSD: auth.c,v 1.2 2013/11/28 22:33:42 christos Exp $");
+__RCSID("NetBSD");
#endif
#include <stdio.h>
diff -r de130c95da6d -r 84bf9aae0539 external/bsd/ppp/dist/pppd/cbcp.c
--- a/external/bsd/ppp/dist/pppd/cbcp.c Sat Oct 25 18:47:46 2014 +0000
+++ b/external/bsd/ppp/dist/pppd/cbcp.c Sat Oct 25 19:06:33 2014 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: cbcp.c,v 1.2 2013/11/28 22:33:42 christos Exp $ */
+/* NetBSD */
/*
* cbcp - Call Back Configuration Protocol.
@@ -40,7 +40,7 @@
#define RCSID "Id: cbcp.c,v 1.17 2006/05/22 00:04:07 paulus Exp "
static const char rcsid[] = RCSID;
#else
-__RCSID("$NetBSD: cbcp.c,v 1.2 2013/11/28 22:33:42 christos Exp $");
+__RCSID("NetBSD");
#endif
#include <stdio.h>
diff -r de130c95da6d -r 84bf9aae0539 external/bsd/ppp/dist/pppd/cbcp.h
--- a/external/bsd/ppp/dist/pppd/cbcp.h Sat Oct 25 18:47:46 2014 +0000
+++ b/external/bsd/ppp/dist/pppd/cbcp.h Sat Oct 25 19:06:33 2014 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: cbcp.h,v 1.2 2013/11/28 22:33:42 christos Exp $ */
+/* NetBSD */
#ifndef CBCP_H
#define CBCP_H
diff -r de130c95da6d -r 84bf9aae0539 external/bsd/ppp/dist/pppd/ccp.c
--- a/external/bsd/ppp/dist/pppd/ccp.c Sat Oct 25 18:47:46 2014 +0000
+++ b/external/bsd/ppp/dist/pppd/ccp.c Sat Oct 25 19:06:33 2014 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ccp.c,v 1.2 2013/11/28 22:33:42 christos Exp $ */
+/* NetBSD */
/*
* ccp.c - PPP Compression Control Protocol.
@@ -35,7 +35,7 @@
#define RCSID "Id: ccp.c,v 1.50 2005/06/26 19:34:41 carlsonj Exp "
static const char rcsid[] = RCSID;
#else
-__RCSID("$NetBSD: ccp.c,v 1.2 2013/11/28 22:33:42 christos Exp $");
+__RCSID("NetBSD");
#endif
#include <stdlib.h>
diff -r de130c95da6d -r 84bf9aae0539 external/bsd/ppp/dist/pppd/ccp.h
--- a/external/bsd/ppp/dist/pppd/ccp.h Sat Oct 25 18:47:46 2014 +0000
+++ b/external/bsd/ppp/dist/pppd/ccp.h Sat Oct 25 19:06:33 2014 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ccp.h,v 1.2 2013/11/28 22:33:42 christos Exp $ */
+/* NetBSD */
/*
* ccp.h - Definitions for PPP Compression Control Protocol.
diff -r de130c95da6d -r 84bf9aae0539 external/bsd/ppp/dist/pppd/chap-md5.c
--- a/external/bsd/ppp/dist/pppd/chap-md5.c Sat Oct 25 18:47:46 2014 +0000
+++ b/external/bsd/ppp/dist/pppd/chap-md5.c Sat Oct 25 19:06:33 2014 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: chap-md5.c,v 1.2 2013/11/28 22:33:42 christos Exp $ */
+/* NetBSD */
/*
* chap-md5.c - New CHAP/MD5 implementation.
@@ -35,7 +35,7 @@
#define RCSID "Id: chap-md5.c,v 1.4 2004/11/09 22:39:25 paulus Exp "
static const char rcsid[] = RCSID;
#else
-__RCSID("$NetBSD: chap-md5.c,v 1.2 2013/11/28 22:33:42 christos Exp $");
+__RCSID("NetBSD");
#endif
#include <stdlib.h>
diff -r de130c95da6d -r 84bf9aae0539 external/bsd/ppp/dist/pppd/chap-md5.h
--- a/external/bsd/ppp/dist/pppd/chap-md5.h Sat Oct 25 18:47:46 2014 +0000
+++ b/external/bsd/ppp/dist/pppd/chap-md5.h Sat Oct 25 19:06:33 2014 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: chap-md5.h,v 1.2 2013/11/28 22:33:42 christos Exp $ */
+/* NetBSD */
/*
* chap-md5.h - New CHAP/MD5 implementation.
diff -r de130c95da6d -r 84bf9aae0539 external/bsd/ppp/dist/pppd/chap-new.c
--- a/external/bsd/ppp/dist/pppd/chap-new.c Sat Oct 25 18:47:46 2014 +0000
+++ b/external/bsd/ppp/dist/pppd/chap-new.c Sat Oct 25 19:06:33 2014 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: chap-new.c,v 1.2 2013/11/28 22:33:42 christos Exp $ */
+/* NetBSD */
/*
* chap-new.c - New CHAP implementation.
@@ -35,7 +35,7 @@
#define RCSID "Id: chap-new.c,v 1.9 2007/06/19 02:08:35 carlsonj Exp "
static const char rcsid[] = RCSID;
#else
-__RCSID("$NetBSD: chap-new.c,v 1.2 2013/11/28 22:33:42 christos Exp $");
+__RCSID("NetBSD");
#endif
#include <stdlib.h>
diff -r de130c95da6d -r 84bf9aae0539 external/bsd/ppp/dist/pppd/chap-new.h
--- a/external/bsd/ppp/dist/pppd/chap-new.h Sat Oct 25 18:47:46 2014 +0000
+++ b/external/bsd/ppp/dist/pppd/chap-new.h Sat Oct 25 19:06:33 2014 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: chap-new.h,v 1.2 2013/11/28 22:33:42 christos Exp $ */
+/* NetBSD */
/*
* chap-new.c - New CHAP implementation.
diff -r de130c95da6d -r 84bf9aae0539 external/bsd/ppp/dist/pppd/chap_ms.c
--- a/external/bsd/ppp/dist/pppd/chap_ms.c Sat Oct 25 18:47:46 2014 +0000
+++ b/external/bsd/ppp/dist/pppd/chap_ms.c Sat Oct 25 19:06:33 2014 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: chap_ms.c,v 1.2 2013/11/28 22:33:42 christos Exp $ */
+/* NetBSD */
/*
* chap_ms.c - Microsoft MS-CHAP compatible implementation.
@@ -81,7 +81,7 @@
#define RCSID "Id: chap_ms.c,v 1.38 2007/12/01 20:10:51 carlsonj Exp "
static const char rcsid[] = RCSID;
#else
-__RCSID("$NetBSD: chap_ms.c,v 1.2 2013/11/28 22:33:42 christos Exp $");
+__RCSID("NetBSD");
#endif
#ifdef CHAPMS
@@ -391,7 +391,7 @@
unsigned char *private)
{
const struct chapms2_response_cache_entry *cache_entry;
- unsigned char auth_response[MS_AUTH_RESPONSE_LENGTH];
+ unsigned char auth_response[MS_AUTH_RESPONSE_LENGTH+1];
challenge++; /* skip length, should be 16 */
*response++ = MS_CHAP2_RESPONSE_LEN;
diff -r de130c95da6d -r 84bf9aae0539 external/bsd/ppp/dist/pppd/chap_ms.h
--- a/external/bsd/ppp/dist/pppd/chap_ms.h Sat Oct 25 18:47:46 2014 +0000
+++ b/external/bsd/ppp/dist/pppd/chap_ms.h Sat Oct 25 19:06:33 2014 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: chap_ms.h,v 1.2 2013/11/28 22:33:42 christos Exp $ */
+/* NetBSD */
/*
* chap_ms.h - Challenge Handshake Authentication Protocol definitions.
diff -r de130c95da6d -r 84bf9aae0539 external/bsd/ppp/dist/pppd/demand.c
--- a/external/bsd/ppp/dist/pppd/demand.c Sat Oct 25 18:47:46 2014 +0000
+++ b/external/bsd/ppp/dist/pppd/demand.c Sat Oct 25 19:06:33 2014 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: demand.c,v 1.2 2013/11/28 22:33:42 christos Exp $ */
+/* NetBSD */
/*
* demand.c - Support routines for demand-dialling.
@@ -35,7 +35,7 @@
#define RCSID "Id: demand.c,v 1.20 2005/08/25 12:14:18 paulus Exp "
static const char rcsid[] = RCSID;
#else
-__RCSID("$NetBSD: demand.c,v 1.2 2013/11/28 22:33:42 christos Exp $");
+__RCSID("NetBSD");
#endif
#include <stdio.h>
diff -r de130c95da6d -r 84bf9aae0539 external/bsd/ppp/dist/pppd/eap.c
--- a/external/bsd/ppp/dist/pppd/eap.c Sat Oct 25 18:47:46 2014 +0000
+++ b/external/bsd/ppp/dist/pppd/eap.c Sat Oct 25 19:06:33 2014 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: eap.c,v 1.2 2013/11/28 22:33:42 christos Exp $ */
+/* NetBSD */
/*
* eap.c - Extensible Authentication Protocol for PPP (RFC 2284)
*
@@ -49,7 +49,7 @@
#define RCSID "Id: eap.c,v 1.4 2004/11/09 22:39:25 paulus Exp "
static const char rcsid[] = RCSID;
#else
-__RCSID("$NetBSD: eap.c,v 1.2 2013/11/28 22:33:42 christos Exp $");
+__RCSID("NetBSD");
#endif
/*
diff -r de130c95da6d -r 84bf9aae0539 external/bsd/ppp/dist/pppd/eap.h
--- a/external/bsd/ppp/dist/pppd/eap.h Sat Oct 25 18:47:46 2014 +0000
+++ b/external/bsd/ppp/dist/pppd/eap.h Sat Oct 25 19:06:33 2014 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: eap.h,v 1.2 2013/11/28 22:33:42 christos Exp $ */
+/* NetBSD */
/*
* eap.h - Extensible Authentication Protocol for PPP (RFC 2284)
diff -r de130c95da6d -r 84bf9aae0539 external/bsd/ppp/dist/pppd/ecp.c
--- a/external/bsd/ppp/dist/pppd/ecp.c Sat Oct 25 18:47:46 2014 +0000
+++ b/external/bsd/ppp/dist/pppd/ecp.c Sat Oct 25 19:06:33 2014 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ecp.c,v 1.2 2013/11/28 22:33:42 christos Exp $ */
+/* NetBSD */
/*
* ecp.c - PPP Encryption Control Protocol.
@@ -64,7 +64,7 @@
#define RCSID "Id: ecp.c,v 1.4 2004/11/04 10:02:26 paulus Exp "
static const char rcsid[] = RCSID;
#else
-__RCSID("$NetBSD: ecp.c,v 1.2 2013/11/28 22:33:42 christos Exp $");
+__RCSID("NetBSD");
#endif
#include <string.h>
diff -r de130c95da6d -r 84bf9aae0539 external/bsd/ppp/dist/pppd/ecp.h
--- a/external/bsd/ppp/dist/pppd/ecp.h Sat Oct 25 18:47:46 2014 +0000
+++ b/external/bsd/ppp/dist/pppd/ecp.h Sat Oct 25 19:06:33 2014 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ecp.h,v 1.2 2013/11/28 22:33:42 christos Exp $ */
+/* NetBSD */
/*
* ecp.h - Definitions for PPP Encryption Control Protocol.
diff -r de130c95da6d -r 84bf9aae0539 external/bsd/ppp/dist/pppd/eui64.c
--- a/external/bsd/ppp/dist/pppd/eui64.c Sat Oct 25 18:47:46 2014 +0000
+++ b/external/bsd/ppp/dist/pppd/eui64.c Sat Oct 25 19:06:33 2014 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: eui64.c,v 1.2 2013/11/28 22:33:42 christos Exp $ */
+/* NetBSD */
/*
* eui64.c - EUI64 routines for IPv6CP.
@@ -42,7 +42,7 @@
#define RCSID "Id: eui64.c,v 1.6 2002/12/04 23:03:32 paulus Exp "
static const char rcsid[] = RCSID;
#else
-__RCSID("$NetBSD: eui64.c,v 1.2 2013/11/28 22:33:42 christos Exp $");
+__RCSID("NetBSD");
#endif
#include "pppd.h"
diff -r de130c95da6d -r 84bf9aae0539 external/bsd/ppp/dist/pppd/eui64.h
--- a/external/bsd/ppp/dist/pppd/eui64.h Sat Oct 25 18:47:46 2014 +0000
+++ b/external/bsd/ppp/dist/pppd/eui64.h Sat Oct 25 19:06:33 2014 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: eui64.h,v 1.2 2013/11/28 22:33:42 christos Exp $ */
+/* NetBSD */
/*
* eui64.h - EUI64 routines for IPv6CP.
diff -r de130c95da6d -r 84bf9aae0539 external/bsd/ppp/dist/pppd/fsm.c
--- a/external/bsd/ppp/dist/pppd/fsm.c Sat Oct 25 18:47:46 2014 +0000
+++ b/external/bsd/ppp/dist/pppd/fsm.c Sat Oct 25 19:06:33 2014 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: fsm.c,v 1.2 2013/11/28 22:33:42 christos Exp $ */
+/* NetBSD */
/*
* fsm.c - {Link, IP} Control Protocol Finite State Machine.
@@ -47,7 +47,7 @@
#define RCSID "Id: fsm.c,v 1.23 2004/11/13 02:28:15 paulus Exp "
static const char rcsid[] = RCSID;
#else
-__RCSID("$NetBSD: fsm.c,v 1.2 2013/11/28 22:33:42 christos Exp $");
+__RCSID("NetBSD");
#endif
/*
Home |
Main Index |
Thread Index |
Old Index