jcs.org / openbsd-src
jcs's openbsd hax
openbsd
fork atom

remove clause 3 and 4. -moj

maja 08069552 0bbc1f11

+26 -107
+1 -6
libexec/rpc.yppasswdd/rpc.yppasswdd.8
··· 1 - .\" $OpenBSD: rpc.yppasswdd.8,v 1.18 2003/06/02 14:20:33 jmc Exp $ 1 + .\" $OpenBSD: rpc.yppasswdd.8,v 1.19 2003/06/02 21:08:26 maja Exp $ 2 2 .\" 3 3 .\" Copyright (c) 1994 Mats O Jansson <moj@stacken.kth.se> 4 4 .\" All rights reserved. ··· 11 11 .\" 2. Redistributions in binary form must reproduce the above copyright 12 12 .\" notice, this list of conditions and the following disclaimer in the 13 13 .\" documentation and/or other materials provided with the distribution. 14 - .\" 3. All advertising materials mentioning features or use of this software 15 - .\" must display the following acknowledgement: 16 - .\" This product includes software developed by Mats O Jansson 17 - .\" 4. The name of the author may not be used to endorse or promote products 18 - .\" derived from this software without specific prior written permission. 19 14 .\" 20 15 .\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS 21 16 .\" OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+2 -7
libexec/rpc.yppasswdd/rpc.yppasswdd.c
··· 1 - /* $OpenBSD: rpc.yppasswdd.c,v 1.12 2002/06/20 03:43:41 deraadt Exp $ */ 1 + /* $OpenBSD: rpc.yppasswdd.c,v 1.13 2003/06/02 21:08:26 maja Exp $ */ 2 2 3 3 /* 4 4 * Copyright (c) 1994 Mats O Jansson <moj@stacken.kth.se> ··· 12 12 * 2. Redistributions in binary form must reproduce the above copyright 13 13 * notice, this list of conditions and the following disclaimer in the 14 14 * documentation and/or other materials provided with the distribution. 15 - * 3. All advertising materials mentioning features or use of this software 16 - * must display the following acknowledgement: 17 - * This product includes software developed by Mats O Jansson 18 - * 4. The name of the author may not be used to endorse or promote products 19 - * derived from this software without specific prior written permission. 20 15 * 21 16 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS 22 17 * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED ··· 32 27 */ 33 28 34 29 #ifndef LINT 35 - static char rcsid[] = "$OpenBSD: rpc.yppasswdd.c,v 1.12 2002/06/20 03:43:41 deraadt Exp $"; 30 + static char rcsid[] = "$OpenBSD: rpc.yppasswdd.c,v 1.13 2003/06/02 21:08:26 maja Exp $"; 36 31 #endif 37 32 38 33 #include <sys/types.h>
+1 -6
libexec/rpc.yppasswdd/yppasswd.h
··· 1 - /* $OpenBSD: yppasswd.h,v 1.5 2002/02/19 19:39:38 millert Exp $*/ 1 + /* $OpenBSD: yppasswd.h,v 1.6 2003/06/02 21:08:26 maja Exp $*/ 2 2 3 3 /* 4 4 * Copyright (c) 1995 Mats O Jansson <moj@stacken.kth.se> ··· 12 12 * 2. Redistributions in binary form must reproduce the above copyright 13 13 * notice, this list of conditions and the following disclaimer in the 14 14 * documentation and/or other materials provided with the distribution. 15 - * 3. All advertising materials mentioning features or use of this software 16 - * must display the following acknowledgement: 17 - * This product includes software developed by Mats O Jansson 18 - * 4. The name of the author may not be used to endorse or promote products 19 - * derived from this software without specific prior written permission. 20 15 * 21 16 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS 22 17 * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+2 -7
libexec/rpc.yppasswdd/yppasswdd_mkpw.c
··· 1 - /* $OpenBSD: yppasswdd_mkpw.c,v 1.24 2003/04/26 18:28:25 pvalchev Exp $ */ 1 + /* $OpenBSD: yppasswdd_mkpw.c,v 1.25 2003/06/02 21:08:26 maja Exp $ */ 2 2 3 3 /* 4 4 * Copyright (c) 1994 Mats O Jansson <moj@stacken.kth.se> ··· 12 12 * 2. Redistributions in binary form must reproduce the above copyright 13 13 * notice, this list of conditions and the following disclaimer in the 14 14 * documentation and/or other materials provided with the distribution. 15 - * 3. All advertising materials mentioning features or use of this software 16 - * must display the following acknowledgement: 17 - * This product includes software developed by Mats O Jansson 18 - * 4. The name of the author may not be used to endorse or promote products 19 - * derived from this software without specific prior written permission. 20 15 * 21 16 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS 22 17 * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED ··· 32 27 */ 33 28 34 29 #ifndef LINT 35 - static char rcsid[] = "$OpenBSD: yppasswdd_mkpw.c,v 1.24 2003/04/26 18:28:25 pvalchev Exp $"; 30 + static char rcsid[] = "$OpenBSD: yppasswdd_mkpw.c,v 1.25 2003/06/02 21:08:26 maja Exp $"; 36 31 #endif 37 32 38 33 #include <sys/param.h>
+2 -7
libexec/rpc.yppasswdd/yppasswdd_proc.c
··· 1 - /* $OpenBSD: yppasswdd_proc.c,v 1.8 2002/06/20 03:43:41 deraadt Exp $ */ 1 + /* $OpenBSD: yppasswdd_proc.c,v 1.9 2003/06/02 21:08:26 maja Exp $ */ 2 2 3 3 /* 4 4 * Copyright (c) 1994 Mats O Jansson <moj@stacken.kth.se> ··· 12 12 * 2. Redistributions in binary form must reproduce the above copyright 13 13 * notice, this list of conditions and the following disclaimer in the 14 14 * documentation and/or other materials provided with the distribution. 15 - * 3. All advertising materials mentioning features or use of this software 16 - * must display the following acknowledgement: 17 - * This product includes software developed by Mats O Jansson 18 - * 4. The name of the author may not be used to endorse or promote products 19 - * derived from this software without specific prior written permission. 20 15 * 21 16 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS 22 17 * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED ··· 32 27 */ 33 28 34 29 #ifndef LINT 35 - static char rcsid[] = "$OpenBSD: yppasswdd_proc.c,v 1.8 2002/06/20 03:43:41 deraadt Exp $"; 30 + static char rcsid[] = "$OpenBSD: yppasswdd_proc.c,v 1.9 2003/06/02 21:08:26 maja Exp $"; 36 31 #endif 37 32 38 33 #include <sys/types.h>
+1 -6
sbin/kbd/kbd_wscons.c
··· 1 - /* $OpenBSD: kbd_wscons.c,v 1.12 2003/03/30 19:10:00 jsyn Exp $ */ 1 + /* $OpenBSD: kbd_wscons.c,v 1.13 2003/06/02 21:10:37 maja Exp $ */ 2 2 3 3 /* 4 4 * Copyright (c) 2001 Mats O Jansson. All rights reserved. ··· 11 11 * 2. Redistributions in binary form must reproduce the above copyright 12 12 * notice, this list of conditions and the following disclaimer in the 13 13 * documentation and/or other materials provided with the distribution. 14 - * 3. All advertising materials mentioning features or use of this software 15 - * must display the following acknowledgement: 16 - * This product includes software developed by Mats O Jansson. 17 - * 4. The name of the author may not be used to endorse or promote products 18 - * derived from this software without specific prior written permission. 19 14 * 20 15 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR 21 16 * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+1 -7
sys/kern/subr_userconf.c
··· 1 - /* $OpenBSD: subr_userconf.c,v 1.32 2003/05/03 21:14:59 deraadt Exp $ */ 1 + /* $OpenBSD: subr_userconf.c,v 1.33 2003/06/02 21:14:47 maja Exp $ */ 2 2 3 3 /* 4 4 * Copyright (c) 1996-2001 Mats O Jansson <moj@stacken.kth.se> ··· 12 12 * 2. Redistributions in binary form must reproduce the above copyright 13 13 * notice, this list of conditions and the following disclaimer in the 14 14 * documentation and/or other materials provided with the distribution. 15 - * 3. All advertising materials mentioning features or use of this software 16 - * must display the following acknowledgement: 17 - * This product includes software developed by Mats O Jansson. 18 - * 4. The name of the author may not be used to endorse or promote 19 - * products derived from this software without specific prior written 20 - * permission. 21 15 * 22 16 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS 23 17 * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+2 -7
usr.sbin/config/cmd.c
··· 1 - /* $OpenBSD: cmd.c,v 1.9 2002/06/01 20:16:15 deraadt Exp $ */ 1 + /* $OpenBSD: cmd.c,v 1.10 2003/06/02 21:19:03 maja Exp $ */ 2 2 3 3 /* 4 4 * Copyright (c) 1999-2001 Mats O Jansson. All rights reserved. ··· 11 11 * 2. Redistributions in binary form must reproduce the above copyright 12 12 * notice, this list of conditions and the following disclaimer in the 13 13 * documentation and/or other materials provided with the distribution. 14 - * 3. All advertising materials mentioning features or use of this software 15 - * must display the following acknowledgement: 16 - * This product includes software developed by Mats O Jansson. 17 - * 4. The name of the author may not be used to endorse or promote products 18 - * derived from this software without specific prior written permission. 19 14 * 20 15 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR 21 16 * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES ··· 30 25 */ 31 26 32 27 #ifndef LINT 33 - static char rcsid[] = "$OpenBSD: cmd.c,v 1.9 2002/06/01 20:16:15 deraadt Exp $"; 28 + static char rcsid[] = "$OpenBSD: cmd.c,v 1.10 2003/06/02 21:19:03 maja Exp $"; 34 29 #endif 35 30 36 31 #include <sys/types.h>
+2 -7
usr.sbin/config/exec.c
··· 1 - /* $OpenBSD: exec.c,v 1.4 2002/09/06 21:10:20 henning Exp $ */ 1 + /* $OpenBSD: exec.c,v 1.5 2003/06/02 21:19:03 maja Exp $ */ 2 2 3 3 /* 4 4 * Copyright (c) 1999 Mats O Jansson. All rights reserved. ··· 11 11 * 2. Redistributions in binary form must reproduce the above copyright 12 12 * notice, this list of conditions and the following disclaimer in the 13 13 * documentation and/or other materials provided with the distribution. 14 - * 3. All advertising materials mentioning features or use of this software 15 - * must display the following acknowledgement: 16 - * This product includes software developed by Mats O Jansson. 17 - * 4. The name of the author may not be used to endorse or promote products 18 - * derived from this software without specific prior written permission. 19 14 * 20 15 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR 21 16 * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES ··· 34 29 #include <stdio.h> 35 30 36 31 #ifndef LINT 37 - static char rcsid[] = "$OpenBSD: exec.c,v 1.4 2002/09/06 21:10:20 henning Exp $"; 32 + static char rcsid[] = "$OpenBSD: exec.c,v 1.5 2003/06/02 21:19:03 maja Exp $"; 38 33 #endif 39 34 40 35 #ifdef AOUT_SUPPORT
+1 -6
usr.sbin/config/exec.h
··· 1 - /* $OpenBSD: exec.h,v 1.3 2002/02/16 21:28:01 millert Exp $ */ 1 + /* $OpenBSD: exec.h,v 1.4 2003/06/02 21:19:03 maja Exp $ */ 2 2 3 3 /* 4 4 * Copyright (c) 1999 Mats O Jansson. All rights reserved. ··· 11 11 * 2. Redistributions in binary form must reproduce the above copyright 12 12 * notice, this list of conditions and the following disclaimer in the 13 13 * documentation and/or other materials provided with the distribution. 14 - * 3. All advertising materials mentioning features or use of this software 15 - * must display the following acknowledgement: 16 - * This product includes software developed by Mats O Jansson. 17 - * 4. The name of the author may not be used to endorse or promote products 18 - * derived from this software without specific prior written permission. 19 14 * 20 15 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR 21 16 * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+2 -7
usr.sbin/config/exec_aout.c
··· 1 - /* $OpenBSD: exec_aout.c,v 1.5 2003/03/12 21:04:04 miod Exp $ */ 1 + /* $OpenBSD: exec_aout.c,v 1.6 2003/06/02 21:19:03 maja Exp $ */ 2 2 3 3 /* 4 4 * Copyright (c) 1999 Mats O Jansson. All rights reserved. ··· 11 11 * 2. Redistributions in binary form must reproduce the above copyright 12 12 * notice, this list of conditions and the following disclaimer in the 13 13 * documentation and/or other materials provided with the distribution. 14 - * 3. All advertising materials mentioning features or use of this software 15 - * must display the following acknowledgement: 16 - * This product includes software developed by Mats O Jansson. 17 - * 4. The name of the author may not be used to endorse or promote products 18 - * derived from this software without specific prior written permission. 19 14 * 20 15 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR 21 16 * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES ··· 30 25 */ 31 26 32 27 #ifndef LINT 33 - static char rcsid[] = "$OpenBSD: exec_aout.c,v 1.5 2003/03/12 21:04:04 miod Exp $"; 28 + static char rcsid[] = "$OpenBSD: exec_aout.c,v 1.6 2003/06/02 21:19:03 maja Exp $"; 34 29 #endif 35 30 36 31 #include <err.h>
+2 -7
usr.sbin/config/exec_ecoff.c
··· 1 - /* $OpenBSD: exec_ecoff.c,v 1.6 2002/03/14 06:51:42 mpech Exp $ */ 1 + /* $OpenBSD: exec_ecoff.c,v 1.7 2003/06/02 21:19:03 maja Exp $ */ 2 2 3 3 /* 4 4 * Copyright (c) 1999 Mats O Jansson. All rights reserved. ··· 11 11 * 2. Redistributions in binary form must reproduce the above copyright 12 12 * notice, this list of conditions and the following disclaimer in the 13 13 * documentation and/or other materials provided with the distribution. 14 - * 3. All advertising materials mentioning features or use of this software 15 - * must display the following acknowledgement: 16 - * This product includes software developed by Mats O Jansson. 17 - * 4. The name of the author may not be used to endorse or promote products 18 - * derived from this software without specific prior written permission. 19 14 * 20 15 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR 21 16 * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES ··· 30 25 */ 31 26 32 27 #ifndef LINT 33 - static char rcsid[] = "$OpenBSD: exec_ecoff.c,v 1.6 2002/03/14 06:51:42 mpech Exp $"; 28 + static char rcsid[] = "$OpenBSD: exec_ecoff.c,v 1.7 2003/06/02 21:19:03 maja Exp $"; 34 29 #endif 35 30 36 31 #include <err.h>
+2 -7
usr.sbin/config/exec_elf.c
··· 1 - /* $OpenBSD: exec_elf.c,v 1.6 2002/08/05 00:26:56 art Exp $ */ 1 + /* $OpenBSD: exec_elf.c,v 1.7 2003/06/02 21:19:03 maja Exp $ */ 2 2 3 3 /* 4 4 * Copyright (c) 1999 Mats O Jansson. All rights reserved. ··· 11 11 * 2. Redistributions in binary form must reproduce the above copyright 12 12 * notice, this list of conditions and the following disclaimer in the 13 13 * documentation and/or other materials provided with the distribution. 14 - * 3. All advertising materials mentioning features or use of this software 15 - * must display the following acknowledgement: 16 - * This product includes software developed by Mats O Jansson. 17 - * 4. The name of the author may not be used to endorse or promote products 18 - * derived from this software without specific prior written permission. 19 14 * 20 15 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR 21 16 * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES ··· 30 25 */ 31 26 32 27 #ifndef LINT 33 - static char rcsid[] = "$OpenBSD: exec_elf.c,v 1.6 2002/08/05 00:26:56 art Exp $"; 28 + static char rcsid[] = "$OpenBSD: exec_elf.c,v 1.7 2003/06/02 21:19:03 maja Exp $"; 34 29 #endif 35 30 36 31 #include <err.h>
+2 -7
usr.sbin/config/ukc.c
··· 1 - /* $OpenBSD: ukc.c,v 1.9 2002/03/23 13:30:24 espie Exp $ */ 1 + /* $OpenBSD: ukc.c,v 1.10 2003/06/02 21:19:03 maja Exp $ */ 2 2 3 3 /* 4 4 * Copyright (c) 1999-2001 Mats O Jansson. All rights reserved. ··· 11 11 * 2. Redistributions in binary form must reproduce the above copyright 12 12 * notice, this list of conditions and the following disclaimer in the 13 13 * documentation and/or other materials provided with the distribution. 14 - * 3. All advertising materials mentioning features or use of this software 15 - * must display the following acknowledgement: 16 - * This product includes software developed by Mats O Jansson. 17 - * 4. The name of the author may not be used to endorse or promote products 18 - * derived from this software without specific prior written permission. 19 14 * 20 15 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR 21 16 * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES ··· 30 25 */ 31 26 32 27 #ifndef LINT 33 - static char rcsid[] = "$OpenBSD: ukc.c,v 1.9 2002/03/23 13:30:24 espie Exp $"; 28 + static char rcsid[] = "$OpenBSD: ukc.c,v 1.10 2003/06/02 21:19:03 maja Exp $"; 34 29 #endif 35 30 36 31 #include <sys/types.h>
+1 -6
usr.sbin/config/ukc.h
··· 1 - /* $OpenBSD: ukc.h,v 1.9 2002/03/23 13:30:24 espie Exp $ */ 1 + /* $OpenBSD: ukc.h,v 1.10 2003/06/02 21:19:03 maja Exp $ */ 2 2 3 3 /* 4 4 * Copyright (c) 1999-2001 Mats O Jansson. All rights reserved. ··· 11 11 * 2. Redistributions in binary form must reproduce the above copyright 12 12 * notice, this list of conditions and the following disclaimer in the 13 13 * documentation and/or other materials provided with the distribution. 14 - * 3. All advertising materials mentioning features or use of this software 15 - * must display the following acknowledgement: 16 - * This product includes software developed by Mats O Jansson. 17 - * 4. The name of the author may not be used to endorse or promote products 18 - * derived from this software without specific prior written permission. 19 14 * 20 15 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR 21 16 * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+2 -7
usr.sbin/config/ukcutil.c
··· 1 - /* $OpenBSD: ukcutil.c,v 1.12 2002/09/06 21:10:20 henning Exp $ */ 1 + /* $OpenBSD: ukcutil.c,v 1.13 2003/06/02 21:19:03 maja Exp $ */ 2 2 3 3 /* 4 4 * Copyright (c) 1999-2001 Mats O Jansson. All rights reserved. ··· 11 11 * 2. Redistributions in binary form must reproduce the above copyright 12 12 * notice, this list of conditions and the following disclaimer in the 13 13 * documentation and/or other materials provided with the distribution. 14 - * 3. All advertising materials mentioning features or use of this software 15 - * must display the following acknowledgement: 16 - * This product includes software developed by Mats O Jansson. 17 - * 4. The name of the author may not be used to endorse or promote products 18 - * derived from this software without specific prior written permission. 19 14 * 20 15 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR 21 16 * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES ··· 30 25 */ 31 26 32 27 #ifndef LINT 33 - static char rcsid[] = "$OpenBSD: ukcutil.c,v 1.12 2002/09/06 21:10:20 henning Exp $"; 28 + static char rcsid[] = "$OpenBSD: ukcutil.c,v 1.13 2003/06/02 21:19:03 maja Exp $"; 34 29 #endif 35 30 36 31 #include <sys/types.h>