CVS commit: src/external/bsd/ppp/usr.sbin/pppd

2021-01-11 Thread Christos Zoulas 
Module Name:src
Committed By:   christos
Date:   Mon Jan 11 21:45:22 UTC 2021

Modified Files:
src/external/bsd/ppp/usr.sbin/pppd: sys-bsd.c

Log Message:
Make this compile without -DINET6 (Kurt Schreiner)


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/external/bsd/ppp/usr.sbin/pppd/sys-bsd.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/ppp/usr.sbin/pppd/sys-bsd.c
diff -u src/external/bsd/ppp/usr.sbin/pppd/sys-bsd.c:1.8 src/external/bsd/ppp/usr.sbin/pppd/sys-bsd.c:1.9
--- src/external/bsd/ppp/usr.sbin/pppd/sys-bsd.c:1.8	Sat Jan  9 11:39:29 2021
+++ src/external/bsd/ppp/usr.sbin/pppd/sys-bsd.c	Mon Jan 11 16:45:22 2021
@@ -121,6 +121,8 @@ __RCSID("NetBSD: sys-bsd.c,v 1.68 2013/0
 #endif
 #include 
 
+#ifdef INET6
+
 #define s6_addr32 __u6_addr.__u6_addr32	/* Non-standard */
 
 #define IN6_SOCKADDR_FROM_EUI64(s, eui64) do { \
@@ -146,8 +148,10 @@ __RCSID("NetBSD: sys-bsd.c,v 1.68 2013/0
 	sin6.s6_addr16[0] = htons(0xfe80);			\
 	eui64_copy(eui64, sin6.s6_addr32[2]);			\
 } while (/*CONSTCOND*/0)
-#endif
-#endif
+#endif /* __KAME__ */
+#endif /* IN6_LLADDR_FROM_EUI64 */
+
+#endif /* INET6 */
 
 #if RTM_VERSION >= 3
 #include 
@@ -201,8 +205,9 @@ static int if6_is_up;		/* the interface 
 #endif /* INET6 */
 static u_int32_t ifaddrs[2];	/* local and remote addresses we set */
 static u_int32_t default_route_gateway;	/* gateway addr for default route */
-static eui64_t  default_route_gateway6; /* Gateway for default IPv6 route added
-*/ 
+#ifdef INET6
+static eui64_t  default_route_gateway6; /* Gateway for default IPv6 route added */
+#endif /* INET6 */
 static u_int32_t proxy_arp_addr;	/* remote addr for proxy arp */
 
 /* Prototypes for procedures local to this file. */
@@ -307,8 +312,10 @@ sys_cleanup(void)
 	cifaddr(0, ifaddrs[0], ifaddrs[1]);
 if (default_route_gateway)
 	cifdefaultroute(0, 0, default_route_gateway);
+#ifdef INET6
 if (default_route_gateway6.e32[0] != 0 || default_route_gateway6.e32[1] != 0)
 	cif6defaultroute(0, default_route_gateway6, default_route_gateway6);
+#endif
 if (proxy_arp_addr)
 	cifproxyarp(0, proxy_arp_addr);
 doing_cleanup = 0;
@@ -1659,6 +1666,7 @@ dodefaultroute(u_int32_t g, int cmd)
 }
 
 
+#ifdef INET6
 /*
  * dodefaultroute - assign/clear a default route through the address given.
  */
@@ -1725,6 +1733,8 @@ cif6defaultroute(int u, eui64_t l, eui64
 	return dodefaultroute6(u, l, g, 'c');
 }
 
+#endif
+
 #if RTM_VERSION >= 3
 
 /*

CVS commit: src/external/bsd/ppp

2021-01-09 Thread Christos Zoulas 
Module Name:src
Committed By:   christos
Date:   Sat Jan  9 16:41:09 UTC 2021

Modified Files:
src/external/bsd/ppp: ppp2netbsd

Log Message:
remove more


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/ppp/ppp2netbsd

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/ppp/ppp2netbsd
diff -u src/external/bsd/ppp/ppp2netbsd:1.2 src/external/bsd/ppp/ppp2netbsd:1.3
--- src/external/bsd/ppp/ppp2netbsd:1.2	Sat Oct 25 15:06:33 2014
+++ src/external/bsd/ppp/ppp2netbsd	Sat Jan  9 11:41:09 2021
@@ -71,5 +71,10 @@ find . -type f -name '.gitignore' | whil
 	rm -f ${m}
 	echo -n "${m} "
 done
+echo -n "Removing .github... "
+find . -type f -name '.github' | while read m; do
+	rm -fr ${m}
+	echo -n "${m} "
+done
 echo; echo
 cleantags .

CVS commit: src/external/bsd/ppp/dist/.github/workflows

2021-01-09 Thread Christos Zoulas 
Module Name:src
Committed By:   christos
Date:   Sat Jan  9 16:40:01 UTC 2021

Removed Files:
src/external/bsd/ppp/dist/.github/workflows: buildroot.yaml
solaris.yaml

Log Message:
remove useless files


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r0 \
src/external/bsd/ppp/dist/.github/workflows/buildroot.yaml \
src/external/bsd/ppp/dist/.github/workflows/solaris.yaml

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/external/bsd/ppp/usr.sbin/pppd

2020-09-06 Thread matthew green 
Module Name:src
Committed By:   mrg
Date:   Sun Sep  6 08:15:04 UTC 2020

Modified Files:
src/external/bsd/ppp/usr.sbin/pppd: sys-bsd.c

Log Message:
use struct zero initialiser and avoid calling memset() on a pointer
of the wrong size.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/ppp/usr.sbin/pppd/sys-bsd.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/ppp/usr.sbin/pppd/sys-bsd.c
diff -u src/external/bsd/ppp/usr.sbin/pppd/sys-bsd.c:1.6 src/external/bsd/ppp/usr.sbin/pppd/sys-bsd.c:1.7
--- src/external/bsd/ppp/usr.sbin/pppd/sys-bsd.c:1.6	Fri Oct  4 09:01:59 2019
+++ src/external/bsd/ppp/usr.sbin/pppd/sys-bsd.c	Sun Sep  6 08:15:04 2020
@@ -1879,10 +1879,10 @@ get_if_hwaddr(u_char *addr, char *name)
 
 #define IFREQ_SAFE (sizeof(struct ifreq) + sizeof(struct sockaddr_dl))
 /* XXX sockaddr_dl is larger than the sockaddr in struct ifreq! */
-union {			/* XXX */
-	struct ifreq _ifreq;	/* XXX */
-	char _X[IFREQ_SAFE]; 	/* XXX */
-} _ifreq_dontsmashstack;	/* XXX */
+union {/* XXX */
+	struct ifreq _ifreq;		/* XXX */
+	char _X[IFREQ_SAFE]; 		/* XXX */
+} _ifreq_dontsmashstack = {0};	/* XXX */
 #define ifreq_xxx _ifreq_dontsmashstack._ifreq			/* XXX */
 
 struct sockaddr_dl *sdl = (struct sockaddr_dl *) _xxx.ifr_addr;
@@ -1890,7 +1890,6 @@ get_if_hwaddr(u_char *addr, char *name)
 
 if ((fd = socket(AF_INET, SOCK_DGRAM, 0)) == -1)
 	return 0;
-(void)memset(sdl, 0, sizeof(*sdl));
 sdl->sdl_family = AF_LINK;
 (void)strlcpy(ifreq_xxx.ifr_name, name, sizeof(ifreq_xxx.ifr_name));
 if (ioctl(fd, SIOCGIFADDR, _xxx) == -1) {

CVS commit: src/external/bsd/ppp/dist/pppd

2020-02-11 Thread Christos Zoulas 
Module Name:src
Committed By:   christos
Date:   Wed Feb 12 01:51:52 UTC 2020

Modified Files:
src/external/bsd/ppp/dist/pppd: eap.c

Log Message:
pppd: Fix bounds check in EAP code

Given that we have just checked vallen < len, it can never be the case
that vallen >= len + sizeof(rhostname).  This fixes the check so we
actually avoid overflowing the rhostname array.

Reported-by: Ilja Van Sprundel 
Signed-off-by: Paul Mackerras 

From:
https://github.com/paulusmack/ppp/commit/8d7970b8f3db727fe798b65f3377fe6787575426


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/ppp/dist/pppd/eap.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/ppp/dist/pppd/eap.c
diff -u src/external/bsd/ppp/dist/pppd/eap.c:1.4 src/external/bsd/ppp/dist/pppd/eap.c:1.5
--- src/external/bsd/ppp/dist/pppd/eap.c:1.4	Sat Oct 25 17:11:37 2014
+++ src/external/bsd/ppp/dist/pppd/eap.c	Tue Feb 11 20:51:52 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: eap.c,v 1.4 2014/10/25 21:11:37 christos Exp $	*/
+/*	$NetBSD: eap.c,v 1.5 2020/02/12 01:51:52 christos Exp $	*/
 /*
  * 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.4 2014/10/25 21:11:37 christos Exp $");
+__RCSID("$NetBSD: eap.c,v 1.5 2020/02/12 01:51:52 christos Exp $");
 #endif
 
 /*
@@ -1433,7 +1433,7 @@ int len;
 		}
 
 		/* Not so likely to happen. */
-		if (vallen >= len + sizeof (rhostname)) {
+		if (len - vallen >= sizeof (rhostname)) {
 			dbglog("EAP: trimming really long peer name down");
 			BCOPY(inp + vallen, rhostname, sizeof (rhostname) - 1);
 			rhostname[sizeof (rhostname) - 1] = '\0';
@@ -1859,7 +1859,7 @@ int len;
 		}
 
 		/* Not so likely to happen. */
-		if (vallen >= len + sizeof (rhostname)) {
+		if (len - vallen >= sizeof (rhostname)) {
 			dbglog("EAP: trimming really long peer name down");
 			BCOPY(inp + vallen, rhostname, sizeof (rhostname) - 1);
 			rhostname[sizeof (rhostname) - 1] = '\0';

CVS commit: src/external/bsd/ppp/usr.sbin/pppd

2018-07-08 Thread Christos Zoulas 
Module Name:src
Committed By:   christos
Date:   Sun Jul  8 21:01:21 UTC 2018

Modified Files:
src/external/bsd/ppp/usr.sbin/pppd: sys-bsd.c

Log Message:
New arp code needs RTF_LLDATA for DELETE to work!
XXX: pullup-8


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/ppp/usr.sbin/pppd/sys-bsd.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/ppp/usr.sbin/pppd/sys-bsd.c
diff -u src/external/bsd/ppp/usr.sbin/pppd/sys-bsd.c:1.4 src/external/bsd/ppp/usr.sbin/pppd/sys-bsd.c:1.5
--- src/external/bsd/ppp/usr.sbin/pppd/sys-bsd.c:1.4	Sat Aug  6 01:58:20 2016
+++ src/external/bsd/ppp/usr.sbin/pppd/sys-bsd.c	Sun Jul  8 17:01:21 2018
@@ -1679,7 +1679,7 @@ sifproxyarp(int unit, u_int32_t hisaddr)
 }
 
 arpmsg.hdr.rtm_type = RTM_ADD;
-arpmsg.hdr.rtm_flags = RTF_ANNOUNCE | RTF_HOST | RTF_STATIC;
+arpmsg.hdr.rtm_flags = RTF_ANNOUNCE | RTF_HOST | RTF_STATIC | RTF_LLDATA;
 arpmsg.hdr.rtm_version = RTM_VERSION;
 arpmsg.hdr.rtm_seq = ++rtm_seq;
 arpmsg.hdr.rtm_addrs = RTA_DST | RTA_GATEWAY;

CVS commit: src/external/bsd/ppp/dist/pppd

2017-01-12 Thread Christos Zoulas 
Module Name:src
Committed By:   christos
Date:   Thu Jan 12 23:06:23 UTC 2017

Modified Files:
src/external/bsd/ppp/dist/pppd: pppd.h

Log Message:
need stddef.h for offsetof


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/ppp/dist/pppd/pppd.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/ppp/dist/pppd/pppd.h
diff -u src/external/bsd/ppp/dist/pppd/pppd.h:1.4 src/external/bsd/ppp/dist/pppd/pppd.h:1.5
--- src/external/bsd/ppp/dist/pppd/pppd.h:1.4	Sat Oct 25 17:11:37 2014
+++ src/external/bsd/ppp/dist/pppd/pppd.h	Thu Jan 12 18:06:23 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: pppd.h,v 1.4 2014/10/25 21:11:37 christos Exp $	*/
+/*	$NetBSD: pppd.h,v 1.5 2017/01/12 23:06:23 christos Exp $	*/
 
 /*
  * pppd.h - PPP daemon global declarations.
@@ -53,6 +53,7 @@
 
 #include 		/* for FILE */
 #include 		/* for NGROUPS_MAX */
+#include 		/* offsetof() */
 #include 		/* for MAXPATHLEN and BSD4_4, if defined */
 #include 		/* for u_int32_t, if defined */
 #include 		/* for struct timeval */

CVS commit: src/external/bsd/ppp/usr.sbin/pppd

2016-08-05 Thread Christos Zoulas 
Module Name:src
Committed By:   christos
Date:   Sat Aug  6 05:58:20 UTC 2016

Modified Files:
src/external/bsd/ppp/usr.sbin/pppd: sys-bsd.c

Log Message:
Instead of listing cloners, try to create one so that the module autoloads.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/ppp/usr.sbin/pppd/sys-bsd.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/ppp/usr.sbin/pppd/sys-bsd.c
diff -u src/external/bsd/ppp/usr.sbin/pppd/sys-bsd.c:1.3 src/external/bsd/ppp/usr.sbin/pppd/sys-bsd.c:1.4
--- src/external/bsd/ppp/usr.sbin/pppd/sys-bsd.c:1.3	Sat Dec 20 08:15:48 2014
+++ src/external/bsd/ppp/usr.sbin/pppd/sys-bsd.c	Sat Aug  6 01:58:20 2016
@@ -339,58 +339,37 @@ sys_check_options(void)
 
 /*
  * ppp_available - check whether the system has any ppp interfaces
- * (in fact we check whether we can do an ioctl on ppp0).
+ * (in fact we check whether we can create one)
  */
 int
 ppp_available(void)
 {
-struct if_clonereq ifcr;
-char *cp, *buf;
-int idx, s;
+int s;
 extern char *no_ppp_msg;
+struct ifreq ifr;
 
-(void)memset(, 0, sizeof(ifcr));
 
 if ((s = socket(AF_INET, SOCK_DGRAM, 0)) < 0)
 	fatal("%s: socket: %m", __func__);
 
-if (ioctl(s, SIOCIFGCLONERS, ) == -1)
-	fatal("%s: ioctl(get cloners): %m", __func__);
-
-buf = malloc(ifcr.ifcr_total * IFNAMSIZ);
-if (buf == NULL)
-	fatal("%s: Unable to allocate cloner name buffer: %m", __func__);
-
-ifcr.ifcr_count = ifcr.ifcr_total;
-ifcr.ifcr_buffer = buf;
-
-if (ioctl(s, SIOCIFGCLONERS, ) == -1)
-	fatal("%s: ioctl(get cloners): %m", __func__);
-(void)close(s);
-
-/*
- * In case some disappeared in the mean time, clamp it down.
- */
-if (ifcr.ifcr_count > ifcr.ifcr_total)
-	ifcr.ifcr_count = ifcr.ifcr_total;
-
-for (cp = buf, idx = 0; idx < ifcr.ifcr_count; idx++, cp += IFNAMSIZ) {
-	if (strcmp(cp, "ppp") == 0)
-	break;
+(void)memset(, 0, sizeof(ifr));
+strlcpy(ifr.ifr_name, "ppp0", sizeof(ifr.ifr_name));
+if (ioctl(s, SIOCIFCREATE, ) == -1) {
+	int notmine = errno == EEXIST;
+	(void)close(s);
+	if (notmine)
+	return 1;
+	goto out;
 }
-free(buf);
+(void)ioctl(s, SIOCIFDESTROY, );
+(void)close(s);
+return 1;
 
-#ifdef __NetBSD__
+out:
 no_ppp_msg = "\
 This system lacks kernel support for PPP.  To include PPP support\n\
 in the kernel, please read the ppp(4) manual page.\n";
-#else
-no_ppp_msg = "\
-This system lacks kernel support for PPP.  To include PPP support\n\
-in the kernel, please follow the steps detailed in the README.bsd\n\
-file in the ppp-2.2 distribution.\n";
-#endif
-return idx != ifcr.ifcr_count;
+return 0;
 }
 
 /*

CVS commit: src/external/bsd/ppp

2014-10-25 Thread Christos Zoulas 
Module Name:src
Committed By:   christos
Date:   Sat Oct 25 19:06:34 UTC 2014

Modified Files:
src/external/bsd/ppp: ppp2netbsd
src/external/bsd/ppp/dist/chat: chat.8 chat.c
src/external/bsd/ppp/dist/pppd: auth.c cbcp.c cbcp.h ccp.c ccp.h
chap-md5.c chap-md5.h chap-new.c chap-new.h chap_ms.c chap_ms.h
demand.c eap.c eap.h ecp.c ecp.h eui64.c eui64.h fsm.c fsm.h ipcp.c
ipcp.h ipv6cp.c ipv6cp.h ipxcp.c ipxcp.h lcp.c lcp.h magic.c
magic.h main.c mppe.h multilink.c options.c patchlevel.h
pathnames.h pppcrypt.c pppcrypt.h pppd.8 pppd.h session.c session.h
tty.c upap.c upap.h utils.c
src/external/bsd/ppp/dist/pppdump: deflate.c
src/external/bsd/ppp/dist/pppstats: pppstats.c
src/external/bsd/ppp/usr.sbin/pppd: sys-bsd.c

Log Message:
merge conflicts


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/ppp/ppp2netbsd
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/ppp/dist/chat/chat.8
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/ppp/dist/chat/chat.c
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/ppp/dist/pppd/auth.c \
src/external/bsd/ppp/dist/pppd/cbcp.c \
src/external/bsd/ppp/dist/pppd/cbcp.h \
src/external/bsd/ppp/dist/pppd/ccp.c src/external/bsd/ppp/dist/pppd/ccp.h \
src/external/bsd/ppp/dist/pppd/chap-md5.c \
src/external/bsd/ppp/dist/pppd/chap-md5.h \
src/external/bsd/ppp/dist/pppd/chap-new.c \
src/external/bsd/ppp/dist/pppd/chap-new.h \
src/external/bsd/ppp/dist/pppd/chap_ms.c \
src/external/bsd/ppp/dist/pppd/chap_ms.h \
src/external/bsd/ppp/dist/pppd/demand.c \
src/external/bsd/ppp/dist/pppd/eap.c src/external/bsd/ppp/dist/pppd/eap.h \
src/external/bsd/ppp/dist/pppd/ecp.c src/external/bsd/ppp/dist/pppd/ecp.h \
src/external/bsd/ppp/dist/pppd/eui64.c \
src/external/bsd/ppp/dist/pppd/eui64.h \
src/external/bsd/ppp/dist/pppd/fsm.c src/external/bsd/ppp/dist/pppd/fsm.h \
src/external/bsd/ppp/dist/pppd/ipcp.c \
src/external/bsd/ppp/dist/pppd/ipcp.h \
src/external/bsd/ppp/dist/pppd/ipv6cp.c \
src/external/bsd/ppp/dist/pppd/ipv6cp.h \
src/external/bsd/ppp/dist/pppd/ipxcp.c \
src/external/bsd/ppp/dist/pppd/ipxcp.h \
src/external/bsd/ppp/dist/pppd/lcp.c src/external/bsd/ppp/dist/pppd/lcp.h \
src/external/bsd/ppp/dist/pppd/magic.c \
src/external/bsd/ppp/dist/pppd/magic.h \
src/external/bsd/ppp/dist/pppd/mppe.h \
src/external/bsd/ppp/dist/pppd/multilink.c \
src/external/bsd/ppp/dist/pppd/options.c \
src/external/bsd/ppp/dist/pppd/patchlevel.h \
src/external/bsd/ppp/dist/pppd/pathnames.h \
src/external/bsd/ppp/dist/pppd/pppcrypt.c \
src/external/bsd/ppp/dist/pppd/pppcrypt.h \
src/external/bsd/ppp/dist/pppd/pppd.8 \
src/external/bsd/ppp/dist/pppd/pppd.h \
src/external/bsd/ppp/dist/pppd/session.c \
src/external/bsd/ppp/dist/pppd/session.h \
src/external/bsd/ppp/dist/pppd/tty.c \
src/external/bsd/ppp/dist/pppd/upap.c \
src/external/bsd/ppp/dist/pppd/upap.h \
src/external/bsd/ppp/dist/pppd/utils.c
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/ppp/dist/pppd/main.c
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/ppp/dist/pppdump/deflate.c
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/ppp/dist/pppstats/pppstats.c
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/ppp/usr.sbin/pppd/sys-bsd.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/ppp/ppp2netbsd
diff -u src/external/bsd/ppp/ppp2netbsd:1.1 src/external/bsd/ppp/ppp2netbsd:1.2
--- src/external/bsd/ppp/ppp2netbsd:1.1	Thu Nov 28 17:33:42 2013
+++ src/external/bsd/ppp/ppp2netbsd	Sat Oct 25 15:06:33 2014
@@ -38,8 +38,7 @@ UNUSED_DIRS=${UNUSED_DIRS} .git 
 UNUSED_FILES=Changes-2.3 README.linux README.pppoe README.sol2 configure
 UNUSED_FILES=${UNUSED_FILES} pppd/md[45].* pppd/sha1.* pppd/srp-entry.*
 UNUSED_FILES=${UNUSED_FILES} pppd/sys-linux.c pppd/sys-solaris.c
-UNUSED_FILES=${UNUSED_FILES} pppdump/zlib.* pppdump/ppp-comp.h .gitignore
-UNUSED_FILES=${UNUSED_FILES} pppdump/.gitignore pppdump/bsd-comp.c
+UNUSED_FILES=${UNUSED_FILES} pppdump/zlib.* pppdump/ppp-comp.h
 
 # Stuff we don't want
 GPL_DIRS=pppd/plugins/pppoatm pppd/plugins/radius pppd/plugins/rp-pppoe
@@ -67,4 +66,10 @@ find . -type f -name 'Makefile*' | while
 done
 echo; echo
 
+echo -n Removing .gitignore... 
+find . -type f -name '.gitignore' | while read m; do
+	rm -f ${m}
+	echo -n ${m} 
+done
+echo; echo
 cleantags .

Index: src/external/bsd/ppp/dist/chat/chat.8
diff -u src/external/bsd/ppp/dist/chat/chat.8:1.2 src/external/bsd/ppp/dist/chat/chat.8:1.3
--- src/external/bsd/ppp/dist/chat/chat.8:1.2	Thu Nov 28 17:33:42 2013
+++ src/external/bsd/ppp/dist/chat/chat.8	Sat Oct 25 15:06:34 2014
@@ -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

CVS commit: src/external/bsd/ppp/dist

2014-10-25 Thread Christos Zoulas 
Module Name:src
Committed By:   christos
Date:   Sat Oct 25 21:11:37 UTC 2014

Modified Files:
src/external/bsd/ppp/dist/pppd: auth.c cbcp.c cbcp.h ccp.c ccp.h
chap-md5.c chap-md5.h chap-new.c chap-new.h chap_ms.c chap_ms.h
demand.c eap.c eap.h ecp.c ecp.h eui64.c eui64.h fsm.c fsm.h ipcp.c
ipcp.h ipv6cp.c ipv6cp.h ipxcp.c ipxcp.h lcp.c lcp.h magic.c
magic.h mppe.h multilink.c options.c pathnames.h pppcrypt.c
pppcrypt.h pppd.h session.c session.h tty.c upap.c upap.h utils.c
src/external/bsd/ppp/dist/pppd/plugins/radius/etc: port-id-map
src/external/bsd/ppp/dist/pppdump: deflate.c
src/external/bsd/ppp/dist/pppstats: pppstats.c

Log Message:
fix rcsids.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/ppp/dist/pppd/auth.c \
src/external/bsd/ppp/dist/pppd/cbcp.c \
src/external/bsd/ppp/dist/pppd/cbcp.h \
src/external/bsd/ppp/dist/pppd/ccp.c src/external/bsd/ppp/dist/pppd/ccp.h \
src/external/bsd/ppp/dist/pppd/chap-md5.c \
src/external/bsd/ppp/dist/pppd/chap-md5.h \
src/external/bsd/ppp/dist/pppd/chap-new.c \
src/external/bsd/ppp/dist/pppd/chap-new.h \
src/external/bsd/ppp/dist/pppd/chap_ms.c \
src/external/bsd/ppp/dist/pppd/chap_ms.h \
src/external/bsd/ppp/dist/pppd/demand.c \
src/external/bsd/ppp/dist/pppd/eap.c src/external/bsd/ppp/dist/pppd/eap.h \
src/external/bsd/ppp/dist/pppd/ecp.c src/external/bsd/ppp/dist/pppd/ecp.h \
src/external/bsd/ppp/dist/pppd/eui64.c \
src/external/bsd/ppp/dist/pppd/eui64.h \
src/external/bsd/ppp/dist/pppd/fsm.c src/external/bsd/ppp/dist/pppd/fsm.h \
src/external/bsd/ppp/dist/pppd/ipcp.c \
src/external/bsd/ppp/dist/pppd/ipcp.h \
src/external/bsd/ppp/dist/pppd/ipv6cp.c \
src/external/bsd/ppp/dist/pppd/ipv6cp.h \
src/external/bsd/ppp/dist/pppd/ipxcp.c \
src/external/bsd/ppp/dist/pppd/ipxcp.h \
src/external/bsd/ppp/dist/pppd/lcp.c src/external/bsd/ppp/dist/pppd/lcp.h \
src/external/bsd/ppp/dist/pppd/magic.c \
src/external/bsd/ppp/dist/pppd/magic.h \
src/external/bsd/ppp/dist/pppd/mppe.h \
src/external/bsd/ppp/dist/pppd/multilink.c \
src/external/bsd/ppp/dist/pppd/options.c \
src/external/bsd/ppp/dist/pppd/pathnames.h \
src/external/bsd/ppp/dist/pppd/pppcrypt.c \
src/external/bsd/ppp/dist/pppd/pppcrypt.h \
src/external/bsd/ppp/dist/pppd/pppd.h \
src/external/bsd/ppp/dist/pppd/session.c \
src/external/bsd/ppp/dist/pppd/session.h \
src/external/bsd/ppp/dist/pppd/tty.c \
src/external/bsd/ppp/dist/pppd/upap.c \
src/external/bsd/ppp/dist/pppd/upap.h \
src/external/bsd/ppp/dist/pppd/utils.c
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/external/bsd/ppp/dist/pppd/plugins/radius/etc/port-id-map
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/ppp/dist/pppdump/deflate.c
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/ppp/dist/pppstats/pppstats.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/ppp/dist/pppd/auth.c
diff -u src/external/bsd/ppp/dist/pppd/auth.c:1.3 src/external/bsd/ppp/dist/pppd/auth.c:1.4
--- src/external/bsd/ppp/dist/pppd/auth.c:1.3	Sat Oct 25 15:06:34 2014
+++ src/external/bsd/ppp/dist/pppd/auth.c	Sat Oct 25 17:11:37 2014
@@ -1,4 +1,4 @@
-/*	NetBSD	*/
+/*	$NetBSD: auth.c,v 1.4 2014/10/25 21:11:37 christos Exp $	*/
 
 /*
  * 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);
+__RCSID($NetBSD: auth.c,v 1.4 2014/10/25 21:11:37 christos Exp $);
 #endif
 
 #include stdio.h
Index: src/external/bsd/ppp/dist/pppd/cbcp.c
diff -u src/external/bsd/ppp/dist/pppd/cbcp.c:1.3 src/external/bsd/ppp/dist/pppd/cbcp.c:1.4
--- src/external/bsd/ppp/dist/pppd/cbcp.c:1.3	Sat Oct 25 15:06:34 2014
+++ src/external/bsd/ppp/dist/pppd/cbcp.c	Sat Oct 25 17:11:37 2014
@@ -1,4 +1,4 @@
-/*	NetBSD	*/
+/*	$NetBSD: cbcp.c,v 1.4 2014/10/25 21:11:37 christos Exp $	*/
 
 /*
  * 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);
+__RCSID($NetBSD: cbcp.c,v 1.4 2014/10/25 21:11:37 christos Exp $);
 #endif
 
 #include stdio.h
Index: src/external/bsd/ppp/dist/pppd/cbcp.h
diff -u src/external/bsd/ppp/dist/pppd/cbcp.h:1.3 src/external/bsd/ppp/dist/pppd/cbcp.h:1.4
--- src/external/bsd/ppp/dist/pppd/cbcp.h:1.3	Sat Oct 25 15:06:34 2014
+++ src/external/bsd/ppp/dist/pppd/cbcp.h	Sat Oct 25 17:11:37 2014
@@ -1,4 +1,4 @@
-/*	NetBSD	*/
+/*	$NetBSD: cbcp.h,v 1.4 2014/10/25 21:11:37 christos Exp $	*/
 
 #ifndef CBCP_H
 #define CBCP_H
Index: src/external/bsd/ppp/dist/pppd/ccp.c
diff -u src/external/bsd/ppp/dist/pppd/ccp.c:1.3 src/external/bsd/ppp/dist/pppd/ccp.c:1.4
---

CVS commit: src/external/bsd/ppp/dist/chat

2013-12-07 Thread Christos Zoulas 
Module Name:src
Committed By:   christos
Date:   Sat Dec  7 20:24:35 UTC 2013

Modified Files:
src/external/bsd/ppp/dist/chat: chat.c

Log Message:
CID 1006982: Fix memory leak


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/ppp/dist/chat/chat.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/ppp/dist/chat/chat.c
diff -u src/external/bsd/ppp/dist/chat/chat.c:1.2 src/external/bsd/ppp/dist/chat/chat.c:1.3
--- src/external/bsd/ppp/dist/chat/chat.c:1.2	Thu Nov 28 17:33:42 2013
+++ src/external/bsd/ppp/dist/chat/chat.c	Sat Dec  7 15:24:35 2013
@@ -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.2 2013/11/28 22:33:42 christos Exp $);
+__RCSID($NetBSD: chat.c,v 1.3 2013/12/07 20:24:35 christos Exp $);
 #endif
 
 #include stdio.h
@@ -1163,6 +1163,7 @@ char *s;
 	timeout_next = 0;
 	s = clean(s, 0);
 	timeout = atoi(s);
+	free(s);
 	
 	if (timeout = 0)
 	timeout = DEFAULT_CHAT_TIMEOUT;

CVS commit: src/external/bsd/ppp/dist/pppd

2013-12-04 Thread Christos Zoulas 
Module Name:src
Committed By:   christos
Date:   Wed Dec  4 15:05:49 UTC 2013

Modified Files:
src/external/bsd/ppp/dist/pppd: main.c

Log Message:
CID 271284: Missing error check on open


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/ppp/dist/pppd/main.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/ppp/dist/pppd/main.c
diff -u src/external/bsd/ppp/dist/pppd/main.c:1.2 src/external/bsd/ppp/dist/pppd/main.c:1.3
--- src/external/bsd/ppp/dist/pppd/main.c:1.2	Thu Nov 28 17:33:42 2013
+++ src/external/bsd/ppp/dist/pppd/main.c	Wed Dec  4 10:05:49 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: main.c,v 1.2 2013/11/28 22:33:42 christos Exp $	*/
+/*	$NetBSD: main.c,v 1.3 2013/12/04 15:05:49 christos Exp $	*/
 
 /*
  * main.c - Point-to-Point Protocol main module
@@ -73,7 +73,7 @@
 #define RCSID	Id: main.c,v 1.156 2008/06/23 11:47:18 paulus Exp 
 static const char rcsid[] = RCSID;
 #else
-__RCSID($NetBSD: main.c,v 1.2 2013/11/28 22:33:42 christos Exp $);
+__RCSID($NetBSD: main.c,v 1.3 2013/12/04 15:05:49 christos Exp $);
 #endif
 
 #include stdio.h
@@ -1682,8 +1682,13 @@ device_script(program, in, out, dont_wai
 
 if (log_to_fd = 0)
 	errfd = log_to_fd;
-else
+else {
 	errfd = open(_PATH_CONNERRS, O_WRONLY | O_APPEND | O_CREAT, 0600);
+	if (errfd == -1) {
+	error(Cannot open `%s': %m, _PATH_CONNERRS);
+	return -1;
+	}
+}
 
 ++conn_running;
 pid = safe_fork(in, out, errfd);