[src/trunk]: src/usr.sbin/pppd/pppd new CMU boilerplate, from openbsd

To: source-changes-hg%NetBSD.org@localhost
Subject: [src/trunk]: src/usr.sbin/pppd/pppd new CMU boilerplate, from openbsd
From: itojun <itojun%NetBSD.org@localhost>
Date: Fri, 24 Jan 2020 11:39:46 +0000
details:   https://anonhg.NetBSD.org/src/rev/656ccdcd5854
branches:  trunk
changeset: 533492:656ccdcd5854
user:      itojun <itojun%NetBSD.org@localhost>
date:      Mon Jul 01 22:19:30 2002 +0000

description:
new CMU boilerplate, from openbsd

diffstat:

 usr.sbin/pppd/pppd/auth.c    |  53 +++++++++++++++++++++++++++++++------------
 usr.sbin/pppd/pppd/fsm.c     |  53 +++++++++++++++++++++++++++++++------------
 usr.sbin/pppd/pppd/fsm.h     |  51 +++++++++++++++++++++++++++++------------
 usr.sbin/pppd/pppd/ipcp.c    |  53 +++++++++++++++++++++++++++++++------------
 usr.sbin/pppd/pppd/ipcp.h    |  51 +++++++++++++++++++++++++++++------------
 usr.sbin/pppd/pppd/ipxcp.c   |  53 +++++++++++++++++++++++++++++++------------
 usr.sbin/pppd/pppd/ipxcp.h   |  51 +++++++++++++++++++++++++++++------------
 usr.sbin/pppd/pppd/lcp.c     |  53 +++++++++++++++++++++++++++++++------------
 usr.sbin/pppd/pppd/lcp.h     |  51 +++++++++++++++++++++++++++++------------
 usr.sbin/pppd/pppd/magic.c   |  53 +++++++++++++++++++++++++++++++------------
 usr.sbin/pppd/pppd/magic.h   |  51 +++++++++++++++++++++++++++++------------
 usr.sbin/pppd/pppd/main.c    |  53 +++++++++++++++++++++++++++++++------------
 usr.sbin/pppd/pppd/options.c |  53 +++++++++++++++++++++++++++++++------------
 usr.sbin/pppd/pppd/pppd.h    |  51 +++++++++++++++++++++++++++++------------
 usr.sbin/pppd/pppd/sys-bsd.c |  43 +++++++++++++++++++++++++++++++++--
 usr.sbin/pppd/pppd/upap.c    |  53 +++++++++++++++++++++++++++++++------------
 usr.sbin/pppd/pppd/upap.h    |  51 +++++++++++++++++++++++++++++------------
 17 files changed, 634 insertions(+), 243 deletions(-)

diffs (truncated from 1161 to 300 lines):

diff -r 2c2c7ec31fcb -r 656ccdcd5854 usr.sbin/pppd/pppd/auth.c
--- a/usr.sbin/pppd/pppd/auth.c Mon Jul 01 22:09:31 2002 +0000
+++ b/usr.sbin/pppd/pppd/auth.c Mon Jul 01 22:19:30 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: auth.c,v 1.28 2002/05/29 19:06:31 christos Exp $       */
+/*     $NetBSD: auth.c,v 1.29 2002/07/01 22:19:30 itojun Exp $ */
 
 /*
  * auth.c - PPP authentication and phase control.
@@ -18,20 +18,43 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * Copyright (c) 1989 Carnegie Mellon University.
- * All rights reserved.
+ * Copyright (c) 1984-2000 Carnegie Mellon University. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
  *
- * Redistribution and use in source and binary forms are permitted
- * provided that the above copyright notice and this paragraph are
- * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
- * distribution and use acknowledge that the software was developed
- * by Carnegie Mellon University.  The name of the
- * University may not be used to endorse or promote products derived
- * from this software without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ * 3. The name "Carnegie Mellon University" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For permission or any legal
+ *    details, please contact
+ *      Office of Technology Transfer
+ *      Carnegie Mellon University
+ *      5000 Forbes Avenue
+ *      Pittsburgh, PA  15213-3890
+ *      (412) 268-4387, fax: (412) 268-7395
+ *      tech-transfer%andrew.cmu.edu@localhost
+ *
+ * 4. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by Computing Services
+ *     at Carnegie Mellon University (http://www.cmu.edu/computing/)."
+ *
+ * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
+ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
+ * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
 #include <sys/cdefs.h>
@@ -39,7 +62,7 @@
 #if 0
 #define RCSID  "Id: auth.c,v 1.69 2001/03/12 22:50:01 paulus Exp "
 #else
-__RCSID("$NetBSD: auth.c,v 1.28 2002/05/29 19:06:31 christos Exp $");
+__RCSID("$NetBSD: auth.c,v 1.29 2002/07/01 22:19:30 itojun Exp $");
 #endif
 #endif
 
diff -r 2c2c7ec31fcb -r 656ccdcd5854 usr.sbin/pppd/pppd/fsm.c
--- a/usr.sbin/pppd/pppd/fsm.c  Mon Jul 01 22:09:31 2002 +0000
+++ b/usr.sbin/pppd/pppd/fsm.c  Mon Jul 01 22:19:30 2002 +0000
@@ -1,22 +1,45 @@
-/*     $NetBSD: fsm.c,v 1.13 2000/09/23 22:39:35 christos Exp $        */
+/*     $NetBSD: fsm.c,v 1.14 2002/07/01 22:19:32 itojun Exp $  */
 
 /*
  * fsm.c - {Link, IP} Control Protocol Finite State Machine.
  *
- * Copyright (c) 1989 Carnegie Mellon University.
- * All rights reserved.
+ * Copyright (c) 1984-2000 Carnegie Mellon University. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
  *
- * Redistribution and use in source and binary forms are permitted
- * provided that the above copyright notice and this paragraph are
- * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
- * distribution and use acknowledge that the software was developed
- * by Carnegie Mellon University.  The name of the
- * University may not be used to endorse or promote products derived
- * from this software without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ * 3. The name "Carnegie Mellon University" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For permission or any legal
+ *    details, please contact
+ *      Office of Technology Transfer
+ *      Carnegie Mellon University
+ *      5000 Forbes Avenue
+ *      Pittsburgh, PA  15213-3890
+ *      (412) 268-4387, fax: (412) 268-7395
+ *      tech-transfer%andrew.cmu.edu@localhost
+ *
+ * 4. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by Computing Services
+ *     at Carnegie Mellon University (http://www.cmu.edu/computing/)."
+ *
+ * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
+ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
+ * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
 #include <sys/cdefs.h>
@@ -24,7 +47,7 @@
 #if 0
 #define RCSID  "Id: fsm.c,v 1.17 1999/08/13 06:46:12 paulus Exp "
 #else
-__RCSID("$NetBSD: fsm.c,v 1.13 2000/09/23 22:39:35 christos Exp $");
+__RCSID("$NetBSD: fsm.c,v 1.14 2002/07/01 22:19:32 itojun Exp $");
 #endif
 #endif
 
diff -r 2c2c7ec31fcb -r 656ccdcd5854 usr.sbin/pppd/pppd/fsm.h
--- a/usr.sbin/pppd/pppd/fsm.h  Mon Jul 01 22:09:31 2002 +0000
+++ b/usr.sbin/pppd/pppd/fsm.h  Mon Jul 01 22:19:30 2002 +0000
@@ -1,24 +1,45 @@
-/*     $NetBSD: fsm.h,v 1.10 2000/09/23 22:39:35 christos Exp $        */
+/*     $NetBSD: fsm.h,v 1.11 2002/07/01 22:19:33 itojun Exp $  */
 
 /*
  * fsm.h - {Link, IP} Control Protocol Finite State Machine definitions.
  *
- * Copyright (c) 1989 Carnegie Mellon University.
- * All rights reserved.
+ * Copyright (c) 1984-2000 Carnegie Mellon University. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
  *
- * Redistribution and use in source and binary forms are permitted
- * provided that the above copyright notice and this paragraph are
- * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
- * distribution and use acknowledge that the software was developed
- * by Carnegie Mellon University.  The name of the
- * University may not be used to endorse or promote products derived
- * from this software without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ * 3. The name "Carnegie Mellon University" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For permission or any legal
+ *    details, please contact
+ *      Office of Technology Transfer
+ *      Carnegie Mellon University
+ *      5000 Forbes Avenue
+ *      Pittsburgh, PA  15213-3890
+ *      (412) 268-4387, fax: (412) 268-7395
+ *      tech-transfer%andrew.cmu.edu@localhost
  *
- * Id: fsm.h,v 1.8 1999/11/15 01:51:50 paulus Exp 
+ * 4. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by Computing Services
+ *     at Carnegie Mellon University (http://www.cmu.edu/computing/)."
+ *
+ * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
+ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
+ * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
 /*
diff -r 2c2c7ec31fcb -r 656ccdcd5854 usr.sbin/pppd/pppd/ipcp.c
--- a/usr.sbin/pppd/pppd/ipcp.c Mon Jul 01 22:09:31 2002 +0000
+++ b/usr.sbin/pppd/pppd/ipcp.c Mon Jul 01 22:19:30 2002 +0000
@@ -1,22 +1,45 @@
-/*     $NetBSD: ipcp.c,v 1.21 2002/05/29 19:06:31 christos Exp $       */
+/*     $NetBSD: ipcp.c,v 1.22 2002/07/01 22:19:33 itojun Exp $ */
 
 /*
  * ipcp.c - PPP IP Control Protocol.
  *
- * Copyright (c) 1989 Carnegie Mellon University.
- * All rights reserved.
+ * Copyright (c) 1984-2000 Carnegie Mellon University. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
  *
- * Redistribution and use in source and binary forms are permitted
- * provided that the above copyright notice and this paragraph are
- * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
- * distribution and use acknowledge that the software was developed
- * by Carnegie Mellon University.  The name of the
- * University may not be used to endorse or promote products derived
- * from this software without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ * 3. The name "Carnegie Mellon University" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For permission or any legal
+ *    details, please contact
+ *      Office of Technology Transfer
+ *      Carnegie Mellon University
+ *      5000 Forbes Avenue
+ *      Pittsburgh, PA  15213-3890
+ *      (412) 268-4387, fax: (412) 268-7395
+ *      tech-transfer%andrew.cmu.edu@localhost
+ *
+ * 4. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by Computing Services
+ *     at Carnegie Mellon University (http://www.cmu.edu/computing/)."
+ *
+ * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
+ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
+ * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
 #include <sys/cdefs.h>
@@ -24,7 +47,7 @@
 #if 0
 #define RCSID  "Id: ipcp.c,v 1.57 2001/03/08 05:11:12 paulus Exp "
 #else
-__RCSID("$NetBSD: ipcp.c,v 1.21 2002/05/29 19:06:31 christos Exp $");
+__RCSID("$NetBSD: ipcp.c,v 1.22 2002/07/01 22:19:33 itojun Exp $");
 #endif
 #endif
 
diff -r 2c2c7ec31fcb -r 656ccdcd5854 usr.sbin/pppd/pppd/ipcp.h
--- a/usr.sbin/pppd/pppd/ipcp.h Mon Jul 01 22:09:31 2002 +0000
+++ b/usr.sbin/pppd/pppd/ipcp.h Mon Jul 01 22:19:30 2002 +0000
@@ -1,24 +1,45 @@
-/*     $NetBSD: ipcp.h,v 1.13 2000/09/23 22:39:36 christos Exp $       */
+/*     $NetBSD: ipcp.h,v 1.14 2002/07/01 22:19:34 itojun Exp $ */
 
 /*
  * ipcp.h - IP Control Protocol definitions.
  *
- * Copyright (c) 1989 Carnegie Mellon University.
- * All rights reserved.
+ * Copyright (c) 1984-2000 Carnegie Mellon University. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
Prev by Date: [src/trunk]: src/sys/net new copyright boilerplate from CMU. from openbsd
Next by Date: [src/trunk]: src/etc fix typo (remove/remote)
Previous by Thread: [src/trunk]: src/sys/net new copyright boilerplate from CMU. from openbsd
Next by Thread: [src/trunk]: src/etc fix typo (remove/remote)
Indexes:
Home | Main Index | Thread Index | Old Index