From 7977da267649fee17261d0d163a12863f3534b57 Mon Sep 17 00:00:00 2001 From: Paul Mackerras Date: Thu, 4 Nov 2004 10:02:26 +0000 Subject: [PATCH 1/1] Remove the requirement that redistributions in binary form reproduce the copyright conditions in documentation from my copyright notice. It still remains in CMU's and others' copyright notices. --- pppd/auth.c | 11 ++---- pppd/ccp.c | 11 ++---- pppd/ccp.h | 11 ++---- pppd/chap-md5.c | 11 ++---- pppd/chap-md5.h | 9 +---- pppd/chap-new.c | 11 ++---- pppd/chap-new.h | 9 +---- pppd/demand.c | 11 ++---- pppd/ecp.c | 11 ++---- pppd/main.c | 28 +++++++++++++- pppd/multilink.c | 9 +---- pppd/pppd.8 | 93 +++++++++++++++++++++++++++++++++++++++++++++- pppd/sys-aix4.c | 11 ++---- pppd/sys-bsd.c | 11 ++---- pppd/sys-linux.c | 11 ++---- pppd/sys-osf.c | 11 ++---- pppd/sys-solaris.c | 11 ++---- pppd/sys-sunos4.c | 11 ++---- pppd/sys-svr4.c | 11 ++---- pppd/sys-ultrix.c | 11 ++---- pppd/tty.c | 13 ++----- pppd/utils.c | 11 ++---- 22 files changed, 177 insertions(+), 160 deletions(-) diff --git a/pppd/auth.c b/pppd/auth.c index 3904d47..9cc3af7 100644 --- a/pppd/auth.c +++ b/pppd/auth.c @@ -10,16 +10,11 @@ * 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. - * - * 3. The name(s) of the authors of this software must not be used to + * 2. The name(s) of the authors of this software must not be used to * endorse or promote products derived from this software without * prior written permission. * - * 4. Redistributions of any form whatsoever must retain the following + * 3. Redistributions of any form whatsoever must retain the following * acknowledgment: * "This product includes software developed by Paul Mackerras * ". @@ -73,7 +68,7 @@ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#define RCSID "$Id: auth.c,v 1.98 2004/10/31 22:23:18 paulus Exp $" +#define RCSID "$Id: auth.c,v 1.99 2004/11/04 10:02:26 paulus Exp $" #include #include diff --git a/pppd/ccp.c b/pppd/ccp.c index bbdaad6..60eceb1 100644 --- a/pppd/ccp.c +++ b/pppd/ccp.c @@ -10,16 +10,11 @@ * 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. - * - * 3. The name(s) of the authors of this software must not be used to + * 2. The name(s) of the authors of this software must not be used to * endorse or promote products derived from this software without * prior written permission. * - * 4. Redistributions of any form whatsoever must retain the following + * 3. Redistributions of any form whatsoever must retain the following * acknowledgment: * "This product includes software developed by Paul Mackerras * ". @@ -33,7 +28,7 @@ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#define RCSID "$Id: ccp.c,v 1.46 2003/05/01 12:30:28 paulus Exp $" +#define RCSID "$Id: ccp.c,v 1.47 2004/11/04 10:02:26 paulus Exp $" #include #include diff --git a/pppd/ccp.h b/pppd/ccp.h index a61d689..6f4a2fe 100644 --- a/pppd/ccp.h +++ b/pppd/ccp.h @@ -10,16 +10,11 @@ * 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. - * - * 3. The name(s) of the authors of this software must not be used to + * 2. The name(s) of the authors of this software must not be used to * endorse or promote products derived from this software without * prior written permission. * - * 4. Redistributions of any form whatsoever must retain the following + * 3. Redistributions of any form whatsoever must retain the following * acknowledgment: * "This product includes software developed by Paul Mackerras * ". @@ -32,7 +27,7 @@ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $Id: ccp.h,v 1.11 2002/12/04 23:03:32 paulus Exp $ + * $Id: ccp.h,v 1.12 2004/11/04 10:02:26 paulus Exp $ */ typedef struct ccp_options { diff --git a/pppd/chap-md5.c b/pppd/chap-md5.c index 3d1b896..b1f6ca0 100644 --- a/pppd/chap-md5.c +++ b/pppd/chap-md5.c @@ -10,16 +10,11 @@ * 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. - * - * 3. The name(s) of the authors of this software must not be used to + * 2. The name(s) of the authors of this software must not be used to * endorse or promote products derived from this software without * prior written permission. * - * 4. Redistributions of any form whatsoever must retain the following + * 3. Redistributions of any form whatsoever must retain the following * acknowledgment: * "This product includes software developed by Paul Mackerras * ". @@ -33,7 +28,7 @@ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#define RCSID "$Id: chap-md5.c,v 1.2 2003/11/27 22:21:46 paulus Exp $" +#define RCSID "$Id: chap-md5.c,v 1.3 2004/11/04 10:02:26 paulus Exp $" #include #include diff --git a/pppd/chap-md5.h b/pppd/chap-md5.h index d63a43f..30d0658 100644 --- a/pppd/chap-md5.h +++ b/pppd/chap-md5.h @@ -10,16 +10,11 @@ * 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. - * - * 3. The name(s) of the authors of this software must not be used to + * 2. The name(s) of the authors of this software must not be used to * endorse or promote products derived from this software without * prior written permission. * - * 4. Redistributions of any form whatsoever must retain the following + * 3. Redistributions of any form whatsoever must retain the following * acknowledgment: * "This product includes software developed by Paul Mackerras * ". diff --git a/pppd/chap-new.c b/pppd/chap-new.c index 367f957..b09fa3e 100644 --- a/pppd/chap-new.c +++ b/pppd/chap-new.c @@ -10,16 +10,11 @@ * 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. - * - * 3. The name(s) of the authors of this software must not be used to + * 2. The name(s) of the authors of this software must not be used to * endorse or promote products derived from this software without * prior written permission. * - * 4. Redistributions of any form whatsoever must retain the following + * 3. Redistributions of any form whatsoever must retain the following * acknowledgment: * "This product includes software developed by Paul Mackerras * ". @@ -33,7 +28,7 @@ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#define RCSID "$Id: chap-new.c,v 1.5 2004/10/31 22:23:18 paulus Exp $" +#define RCSID "$Id: chap-new.c,v 1.6 2004/11/04 10:02:26 paulus Exp $" #include #include diff --git a/pppd/chap-new.h b/pppd/chap-new.h index e6a534d..48235d4 100644 --- a/pppd/chap-new.h +++ b/pppd/chap-new.h @@ -10,16 +10,11 @@ * 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. - * - * 3. The name(s) of the authors of this software must not be used to + * 2. The name(s) of the authors of this software must not be used to * endorse or promote products derived from this software without * prior written permission. * - * 4. Redistributions of any form whatsoever must retain the following + * 3. Redistributions of any form whatsoever must retain the following * acknowledgment: * "This product includes software developed by Paul Mackerras * ". diff --git a/pppd/demand.c b/pppd/demand.c index 83b1d37..8bf96d0 100644 --- a/pppd/demand.c +++ b/pppd/demand.c @@ -10,16 +10,11 @@ * 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. - * - * 3. The name(s) of the authors of this software must not be used to + * 2. The name(s) of the authors of this software must not be used to * endorse or promote products derived from this software without * prior written permission. * - * 4. Redistributions of any form whatsoever must retain the following + * 3. Redistributions of any form whatsoever must retain the following * acknowledgment: * "This product includes software developed by Paul Mackerras * ". @@ -33,7 +28,7 @@ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#define RCSID "$Id: demand.c,v 1.18 2004/10/28 00:15:08 paulus Exp $" +#define RCSID "$Id: demand.c,v 1.19 2004/11/04 10:02:26 paulus Exp $" #include #include diff --git a/pppd/ecp.c b/pppd/ecp.c index a82c7b9..e5754e5 100644 --- a/pppd/ecp.c +++ b/pppd/ecp.c @@ -39,16 +39,11 @@ * 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. - * - * 3. The name(s) of the authors of this software must not be used to + * 2. The name(s) of the authors of this software must not be used to * endorse or promote products derived from this software without * prior written permission. * - * 4. Redistributions of any form whatsoever must retain the following + * 3. Redistributions of any form whatsoever must retain the following * acknowledgment: * "This product includes software developed by Paul Mackerras * ". @@ -62,7 +57,7 @@ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#define RCSID "$Id: ecp.c,v 1.3 2003/01/10 07:12:36 fcusack Exp $" +#define RCSID "$Id: ecp.c,v 1.4 2004/11/04 10:02:26 paulus Exp $" static const char rcsid[] = RCSID; diff --git a/pppd/main.c b/pppd/main.c index 6915bae..712227b 100644 --- a/pppd/main.c +++ b/pppd/main.c @@ -38,9 +38,35 @@ * 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. + * + * Copyright (c) 1999-2004 Paul Mackerras. 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. The name(s) of the authors of this software must not be used to + * endorse or promote products derived from this software without + * prior written permission. + * + * 3. Redistributions of any form whatsoever must retain the following + * acknowledgment: + * "This product includes software developed by Paul Mackerras + * ". + * + * THE AUTHORS OF THIS SOFTWARE DISCLAIM ALL WARRANTIES WITH REGARD TO + * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY + * AND FITNESS, IN NO EVENT SHALL THE AUTHORS 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. */ -#define RCSID "$Id: main.c,v 1.140 2004/11/04 09:56:26 paulus Exp $" +#define RCSID "$Id: main.c,v 1.141 2004/11/04 10:02:26 paulus Exp $" #include #include diff --git a/pppd/multilink.c b/pppd/multilink.c index 6d4b4ff..dd6d23f 100644 --- a/pppd/multilink.c +++ b/pppd/multilink.c @@ -10,16 +10,11 @@ * 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. - * - * 3. The name(s) of the authors of this software must not be used to + * 2. The name(s) of the authors of this software must not be used to * endorse or promote products derived from this software without * prior written permission. * - * 4. Redistributions of any form whatsoever must retain the following + * 3. Redistributions of any form whatsoever must retain the following * acknowledgment: * "This product includes software developed by Paul Mackerras * ". diff --git a/pppd/pppd.8 b/pppd/pppd.8 index 753fb98..0ccb2e6 100644 --- a/pppd/pppd.8 +++ b/pppd/pppd.8 @@ -1,5 +1,5 @@ .\" manual page [] for pppd 2.4 -.\" $Id: pppd.8,v 1.78 2004/11/04 09:57:42 paulus Exp $ +.\" $Id: pppd.8,v 1.79 2004/11/04 10:02:26 paulus Exp $ .\" SH section heading .\" SS subsection heading .\" LP paragraph @@ -1778,3 +1778,94 @@ Karl Fox, Greg Christy, and Brad Parker. + +.SH COPYRIGHT +Pppd is copyrighted and made available under conditions which provide +that it may be copied and used in source or binary forms provided that +the conditions listed below are met. Portions of pppd are covered by +the following copyright notices: +.LP +Copyright (c) 1984-2000 Carnegie Mellon University. All rights +reserved. +.br +Copyright (c) 1993-2004 Paul Mackerras. All rights reserved. +.br +Copyright (c) 1995 Pedro Roque Marques. All rights reserved. +.br +Copyright (c) 1995 Eric Rosenquist. All rights reserved. +.br +Copyright (c) 1999 Tommi Komulainen. All rights reserved. +.br +Copyright (C) Andrew Tridgell 1999 +.br +Copyright (c) 2000 by Sun Microsystems, Inc. All rights reserved. +.br +Copyright (c) 2001 by Sun Microsystems, Inc. All rights reserved. +.br +Copyright (c) 2002 Google, Inc. All rights reserved. +.LP +The copyright notices contain the following statements. +.LP +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met: +.LP +1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. +.LP +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. +.LP +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 +.br + Office of Technology Transfer +.br + Carnegie Mellon University +.br + 5000 Forbes Avenue +.br + Pittsburgh, PA 15213-3890 +.br + (412) 268-4387, fax: (412) 268-7395 +.br + tech-transfer@andrew.cmu.edu +.LP +3b. The name(s) of the authors of this software must not be used to + endorse or promote products derived from this software without + prior written permission. +.LP +4. Redistributions of any form whatsoever must retain the following + acknowledgments: +.br + "This product includes software developed by Computing Services + at Carnegie Mellon University (http://www.cmu.edu/computing/)." +.br + "This product includes software developed by Paul Mackerras + ". +.br + "This product includes software developed by Pedro Roque Marques + ". +.br + "This product includes software developed by Tommi Komulainen + ". +.LP +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. +.LP +THE AUTHORS OF THIS SOFTWARE DISCLAIM ALL WARRANTIES WITH REGARD TO +THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY +AND FITNESS, IN NO EVENT SHALL THE AUTHORS 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 --git a/pppd/sys-aix4.c b/pppd/sys-aix4.c index 93c7c73..ef69813 100644 --- a/pppd/sys-aix4.c +++ b/pppd/sys-aix4.c @@ -11,16 +11,11 @@ * 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. - * - * 3. The name(s) of the authors of this software must not be used to + * 2. The name(s) of the authors of this software must not be used to * endorse or promote products derived from this software without * prior written permission. * - * 4. Redistributions of any form whatsoever must retain the following + * 3. Redistributions of any form whatsoever must retain the following * acknowledgment: * "This product includes software developed by Paul Mackerras * ". @@ -74,7 +69,7 @@ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#define RCSID "$Id: sys-aix4.c,v 1.23 2002/12/04 23:03:32 paulus Exp $" +#define RCSID "$Id: sys-aix4.c,v 1.24 2004/11/04 10:02:26 paulus Exp $" /* * TODO: diff --git a/pppd/sys-bsd.c b/pppd/sys-bsd.c index 0cccbae..da186a4 100644 --- a/pppd/sys-bsd.c +++ b/pppd/sys-bsd.c @@ -11,16 +11,11 @@ * 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. - * - * 3. The name(s) of the authors of this software must not be used to + * 2. The name(s) of the authors of this software must not be used to * endorse or promote products derived from this software without * prior written permission. * - * 4. Redistributions of any form whatsoever must retain the following + * 3. Redistributions of any form whatsoever must retain the following * acknowledgment: * "This product includes software developed by Paul Mackerras * ". @@ -74,7 +69,7 @@ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#define RCSID "$Id: sys-bsd.c,v 1.49 2002/12/06 12:06:45 paulus Exp $" +#define RCSID "$Id: sys-bsd.c,v 1.50 2004/11/04 10:02:26 paulus Exp $" /* $NetBSD: sys-bsd.c,v 1.1.1.3 1997/09/26 18:53:04 christos Exp $ */ /* diff --git a/pppd/sys-linux.c b/pppd/sys-linux.c index 5a5268b..26cadc6 100644 --- a/pppd/sys-linux.c +++ b/pppd/sys-linux.c @@ -2,7 +2,7 @@ * sys-linux.c - System-dependent procedures for setting up * PPP interfaces on Linux systems * - * Copyright (c) 1994-2002 Paul Mackerras. All rights reserved. + * Copyright (c) 1994-2004 Paul Mackerras. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -11,16 +11,11 @@ * 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. - * - * 3. The name(s) of the authors of this software must not be used to + * 2. The name(s) of the authors of this software must not be used to * endorse or promote products derived from this software without * prior written permission. * - * 4. Redistributions of any form whatsoever must retain the following + * 3. Redistributions of any form whatsoever must retain the following * acknowledgment: * "This product includes software developed by Paul Mackerras * ". diff --git a/pppd/sys-osf.c b/pppd/sys-osf.c index 80ce8cb..e2f4218 100644 --- a/pppd/sys-osf.c +++ b/pppd/sys-osf.c @@ -10,16 +10,11 @@ * 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. - * - * 3. The name(s) of the authors of this software must not be used to + * 2. The name(s) of the authors of this software must not be used to * endorse or promote products derived from this software without * prior written permission. * - * 4. Redistributions of any form whatsoever must retain the following + * 3. Redistributions of any form whatsoever must retain the following * acknowledgment: * "This product includes software developed by Paul Mackerras * ". @@ -73,7 +68,7 @@ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#define RCSID "$Id: sys-osf.c,v 1.32 2002/12/04 23:03:33 paulus Exp $" +#define RCSID "$Id: sys-osf.c,v 1.33 2004/11/04 10:02:26 paulus Exp $" #include #include diff --git a/pppd/sys-solaris.c b/pppd/sys-solaris.c index 076bf7d..fb8f0fd 100644 --- a/pppd/sys-solaris.c +++ b/pppd/sys-solaris.c @@ -27,16 +27,11 @@ * 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. - * - * 3. The name(s) of the authors of this software must not be used to + * 2. The name(s) of the authors of this software must not be used to * endorse or promote products derived from this software without * prior written permission. * - * 4. Redistributions of any form whatsoever must retain the following + * 3. Redistributions of any form whatsoever must retain the following * acknowledgment: * "This product includes software developed by Paul Mackerras * ". @@ -90,7 +85,7 @@ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#define RCSID "$Id: sys-solaris.c,v 1.12 2004/01/17 05:47:55 carlsonj Exp $" +#define RCSID "$Id: sys-solaris.c,v 1.13 2004/11/04 10:02:26 paulus Exp $" #include #include diff --git a/pppd/sys-sunos4.c b/pppd/sys-sunos4.c index f4cabda..3247b73 100644 --- a/pppd/sys-sunos4.c +++ b/pppd/sys-sunos4.c @@ -10,16 +10,11 @@ * 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. - * - * 3. The name(s) of the authors of this software must not be used to + * 2. The name(s) of the authors of this software must not be used to * endorse or promote products derived from this software without * prior written permission. * - * 4. Redistributions of any form whatsoever must retain the following + * 3. Redistributions of any form whatsoever must retain the following * acknowledgment: * "This product includes software developed by Paul Mackerras * ". @@ -73,7 +68,7 @@ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#define RCSID "$Id: sys-sunos4.c,v 1.32 2003/04/07 00:01:46 paulus Exp $" +#define RCSID "$Id: sys-sunos4.c,v 1.33 2004/11/04 10:02:26 paulus Exp $" #include #include diff --git a/pppd/sys-svr4.c b/pppd/sys-svr4.c index 8f18453..1230cc6 100644 --- a/pppd/sys-svr4.c +++ b/pppd/sys-svr4.c @@ -27,16 +27,11 @@ * 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. - * - * 3. The name(s) of the authors of this software must not be used to + * 2. The name(s) of the authors of this software must not be used to * endorse or promote products derived from this software without * prior written permission. * - * 4. Redistributions of any form whatsoever must retain the following + * 3. Redistributions of any form whatsoever must retain the following * acknowledgment: * "This product includes software developed by Paul Mackerras * ". @@ -90,7 +85,7 @@ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#define RCSID "$Id: sys-svr4.c,v 1.45 2002/12/04 23:03:33 paulus Exp $" +#define RCSID "$Id: sys-svr4.c,v 1.46 2004/11/04 10:02:26 paulus Exp $" #include #include diff --git a/pppd/sys-ultrix.c b/pppd/sys-ultrix.c index 1ad0dca..6945894 100644 --- a/pppd/sys-ultrix.c +++ b/pppd/sys-ultrix.c @@ -11,16 +11,11 @@ * 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. - * - * 3. The name(s) of the authors of this software must not be used to + * 2. The name(s) of the authors of this software must not be used to * endorse or promote products derived from this software without * prior written permission. * - * 4. Redistributions of any form whatsoever must retain the following + * 3. Redistributions of any form whatsoever must retain the following * acknowledgment: * "This product includes software developed by Paul Mackerras * ". @@ -74,7 +69,7 @@ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#define RCSID "$Id: sys-ultrix.c,v 1.34 2002/12/04 23:03:33 paulus Exp $" +#define RCSID "$Id: sys-ultrix.c,v 1.35 2004/11/04 10:02:26 paulus Exp $" /* * TODO: diff --git a/pppd/tty.c b/pppd/tty.c index 7d65ba8..5d65cd2 100644 --- a/pppd/tty.c +++ b/pppd/tty.c @@ -1,7 +1,7 @@ /* * tty.c - code for handling serial ports in pppd. * - * Copyright (C) 2000-2002 Paul Mackerras. All rights reserved. + * Copyright (C) 2000-2004 Paul Mackerras. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -10,16 +10,11 @@ * 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. - * - * 3. The name(s) of the authors of this software must not be used to + * 2. The name(s) of the authors of this software must not be used to * endorse or promote products derived from this software without * prior written permission. * - * 4. Redistributions of any form whatsoever must retain the following + * 3. Redistributions of any form whatsoever must retain the following * acknowledgment: * "This product includes software developed by Paul Mackerras * ". @@ -73,7 +68,7 @@ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#define RCSID "$Id: tty.c,v 1.17 2004/11/04 09:59:12 paulus Exp $" +#define RCSID "$Id: tty.c,v 1.18 2004/11/04 10:02:26 paulus Exp $" #include #include diff --git a/pppd/utils.c b/pppd/utils.c index 1033f9d..44f2e73 100644 --- a/pppd/utils.c +++ b/pppd/utils.c @@ -10,16 +10,11 @@ * 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. - * - * 3. The name(s) of the authors of this software must not be used to + * 2. The name(s) of the authors of this software must not be used to * endorse or promote products derived from this software without * prior written permission. * - * 4. Redistributions of any form whatsoever must retain the following + * 3. Redistributions of any form whatsoever must retain the following * acknowledgment: * "This product includes software developed by Paul Mackerras * ". @@ -33,7 +28,7 @@ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#define RCSID "$Id: utils.c,v 1.23 2004/01/13 04:13:08 paulus Exp $" +#define RCSID "$Id: utils.c,v 1.24 2004/11/04 10:02:26 paulus Exp $" #include #include -- 2.39.2