diff options
| -rw-r--r-- | usr.sbin/ypserv/common/ypdb.c | 3 | ||||
| -rw-r--r-- | usr.sbin/ypserv/common/ypdb.h | 3 | ||||
| -rw-r--r-- | usr.sbin/ypserv/common/ypdef.h | 10 | ||||
| -rw-r--r-- | usr.sbin/ypserv/makedbm/makedbm.8 | 10 | ||||
| -rw-r--r-- | usr.sbin/ypserv/makedbm/makedbm.c | 12 | ||||
| -rw-r--r-- | usr.sbin/ypserv/stdhosts/stdhosts.8 | 10 | ||||
| -rw-r--r-- | usr.sbin/ypserv/stdhosts/stdhosts.c | 12 | ||||
| -rw-r--r-- | usr.sbin/ypserv/ypserv/acl.c | 12 | ||||
| -rw-r--r-- | usr.sbin/ypserv/ypserv/acl.h | 10 | ||||
| -rw-r--r-- | usr.sbin/ypserv/ypserv/securenet.5 | 10 | ||||
| -rw-r--r-- | usr.sbin/ypserv/ypserv/ypserv.8 | 10 | ||||
| -rw-r--r-- | usr.sbin/ypserv/ypserv/ypserv.acl.5 | 10 | ||||
| -rw-r--r-- | usr.sbin/ypserv/ypserv/ypserv.c | 12 | ||||
| -rw-r--r-- | usr.sbin/ypserv/ypserv/ypserv_db.c | 34 | ||||
| -rw-r--r-- | usr.sbin/ypserv/ypserv/ypserv_proc.c | 12 | ||||
| -rw-r--r-- | usr.sbin/ypserv/yptest/yptest.8 | 10 | ||||
| -rw-r--r-- | usr.sbin/ypserv/yptest/yptest.c | 12 | ||||
| -rw-r--r-- | usr.sbin/ypserv/ypxfr/ypxfr.8 | 12 | ||||
| -rw-r--r-- | usr.sbin/ypserv/ypxfr/ypxfr_xdr.c | 12 |
19 files changed, 133 insertions, 83 deletions
diff --git a/usr.sbin/ypserv/common/ypdb.c b/usr.sbin/ypserv/common/ypdb.c index 924b9617064..7de9001e169 100644 --- a/usr.sbin/ypserv/common/ypdb.c +++ b/usr.sbin/ypserv/common/ypdb.c @@ -1,9 +1,8 @@ -/* $OpenBSD: ypdb.c,v 1.3 1996/05/30 09:53:01 deraadt Exp $ */ +/* $OpenBSD: ypdb.c,v 1.4 1996/06/26 21:26:33 maja Exp $ */ /* * Copyright (c) 1990, 1993 * The Regents of the University of California. All rights reserved. - * Copyright (c) 1994 Mats O Jansson <moj@stacken.kth.se> * All rights reserved. * * This code is derived from software contributed to Berkeley by diff --git a/usr.sbin/ypserv/common/ypdb.h b/usr.sbin/ypserv/common/ypdb.h index 368cc66f884..f645bf3b831 100644 --- a/usr.sbin/ypserv/common/ypdb.h +++ b/usr.sbin/ypserv/common/ypdb.h @@ -1,9 +1,8 @@ -/* $OpenBSD: ypdb.h,v 1.3 1996/05/30 09:53:01 deraadt Exp $ */ +/* $OpenBSD: ypdb.h,v 1.4 1996/06/26 21:26:34 maja Exp $ */ /* * Copyright (c) 1990, 1993 * The Regents of the University of California. All rights reserved. - * Copyright (c) 1994 Mats O Jansson <moj@stacken.kth.se> * All rights reserved. * * This code is derived from software contributed to Berkeley by diff --git a/usr.sbin/ypserv/common/ypdef.h b/usr.sbin/ypserv/common/ypdef.h index d7a16c6d8e9..b2c9d6892e8 100644 --- a/usr.sbin/ypserv/common/ypdef.h +++ b/usr.sbin/ypserv/common/ypdef.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ypdef.h,v 1.3 1996/05/30 09:53:02 deraadt Exp $ */ +/* $OpenBSD: ypdef.h,v 1.4 1996/06/26 21:26:34 maja Exp $ */ /* * Copyright (c) 1994 Mats O Jansson <moj@stacken.kth.se> @@ -14,11 +14,9 @@ * documentation and/or other materials provided with the distribution. * 3. All advertising materials mentioning features or use of this software * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. + * This product includes software developed by Mats O Jansson. + * 4. The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED diff --git a/usr.sbin/ypserv/makedbm/makedbm.8 b/usr.sbin/ypserv/makedbm/makedbm.8 index 3b089256675..648c31dcf05 100644 --- a/usr.sbin/ypserv/makedbm/makedbm.8 +++ b/usr.sbin/ypserv/makedbm/makedbm.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: makedbm.8,v 1.3 1996/05/30 09:53:05 deraadt Exp $ +.\" $OpenBSD: makedbm.8,v 1.4 1996/06/26 21:26:35 maja Exp $ .\" Copyright (c) 1994 Mats O Jansson <moj@stacken.kth.se> .\" All rights reserved. .\" @@ -10,9 +10,11 @@ .\" 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 of the author may not be used to endorse or promote -.\" products derived from this software without specific prior written -.\" permission. +.\" 3. All advertising materials mentioning features or use of this software +.\" must display the following acknowledgement: +.\" This product includes software developed by Mats O Jansson +.\" 4. The name of the author may not be used to endorse or promote products +.\" derived from this software without specific prior written permission. .\" .\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS .\" OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED diff --git a/usr.sbin/ypserv/makedbm/makedbm.c b/usr.sbin/ypserv/makedbm/makedbm.c index 0d9c50ed9b8..ca8acc57a82 100644 --- a/usr.sbin/ypserv/makedbm/makedbm.c +++ b/usr.sbin/ypserv/makedbm/makedbm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: makedbm.c,v 1.3 1996/05/30 09:53:06 deraadt Exp $ */ +/* $OpenBSD: makedbm.c,v 1.4 1996/06/26 21:26:35 maja Exp $ */ /* * Copyright (c) 1994 Mats O Jansson <moj@stacken.kth.se> @@ -12,9 +12,11 @@ * 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 of the author may not be used to endorse or promote - * products derived from this software without specific prior written - * permission. + * 3. All advertising materials mentioning features or use of this software + * must display the following acknowledgement: + * This product includes software developed by Mats O Jansson + * 4. The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED @@ -30,7 +32,7 @@ */ #ifndef LINT -static char rcsid[] = "$OpenBSD: makedbm.c,v 1.3 1996/05/30 09:53:06 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: makedbm.c,v 1.4 1996/06/26 21:26:35 maja Exp $"; #endif #include <stdio.h> diff --git a/usr.sbin/ypserv/stdhosts/stdhosts.8 b/usr.sbin/ypserv/stdhosts/stdhosts.8 index 10844bd3862..6cd55404f65 100644 --- a/usr.sbin/ypserv/stdhosts/stdhosts.8 +++ b/usr.sbin/ypserv/stdhosts/stdhosts.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: stdhosts.8,v 1.3 1996/05/30 09:53:14 deraadt Exp $ +.\" $OpenBSD: stdhosts.8,v 1.4 1996/06/26 21:26:36 maja Exp $ .\" Copyright (c) 1994 Mats O Jansson <moj@stacken.kth.se> .\" All rights reserved. .\" @@ -10,9 +10,11 @@ .\" 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 of the author may not be used to endorse or promote -.\" products derived from this software without specific prior written -.\" permission. +.\" 3. All advertising materials mentioning features or use of this software +.\" must display the following acknowledgement: +.\" This product includes software developed by Mats O Jansson +.\" 4. The name of the author may not be used to endorse or promote products +.\" derived from this software without specific prior written permission. .\" .\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS .\" OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED diff --git a/usr.sbin/ypserv/stdhosts/stdhosts.c b/usr.sbin/ypserv/stdhosts/stdhosts.c index 3335487218e..fb76efd0191 100644 --- a/usr.sbin/ypserv/stdhosts/stdhosts.c +++ b/usr.sbin/ypserv/stdhosts/stdhosts.c @@ -1,4 +1,4 @@ -/* $OpenBSD: stdhosts.c,v 1.2 1996/05/30 09:53:14 deraadt Exp $ */ +/* $OpenBSD: stdhosts.c,v 1.3 1996/06/26 21:26:36 maja Exp $ */ /* * Copyright (c) 1994 Mats O Jansson <moj@stacken.kth.se> @@ -12,9 +12,11 @@ * 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 of the author may not be used to endorse or promote - * products derived from this software without specific prior written - * permission. + * 3. All advertising materials mentioning features or use of this software + * must display the following acknowledgement: + * This product includes software developed by Mats O Jansson + * 4. The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED @@ -30,7 +32,7 @@ */ #ifndef LINT -static char rcsid[] = "$OpenBSD: stdhosts.c,v 1.2 1996/05/30 09:53:14 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: stdhosts.c,v 1.3 1996/06/26 21:26:36 maja Exp $"; #endif #include <sys/types.h> diff --git a/usr.sbin/ypserv/ypserv/acl.c b/usr.sbin/ypserv/ypserv/acl.c index cec1b6f0738..d6787af887c 100644 --- a/usr.sbin/ypserv/ypserv/acl.c +++ b/usr.sbin/ypserv/ypserv/acl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: acl.c,v 1.2 1996/05/30 09:53:24 deraadt Exp $ */ +/* $OpenBSD: acl.c,v 1.3 1996/06/26 21:26:36 maja Exp $ */ /* * Copyright (c) 1994 Mats O Jansson <moj@stacken.kth.se> @@ -12,9 +12,11 @@ * 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 of the author may not be used to endorse or promote - * products derived from this software without specific prior written - * permission. + * 3. All advertising materials mentioning features or use of this software + * must display the following acknowledgement: + * This product includes software developed by Mats O Jansson + * 4. The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED @@ -30,7 +32,7 @@ */ #ifndef LINT -static char rcsid[] = "$OpenBSD: acl.c,v 1.2 1996/05/30 09:53:24 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: acl.c,v 1.3 1996/06/26 21:26:36 maja Exp $"; #endif #include <sys/types.h> diff --git a/usr.sbin/ypserv/ypserv/acl.h b/usr.sbin/ypserv/ypserv/acl.h index 052327856a3..6c3127e5089 100644 --- a/usr.sbin/ypserv/ypserv/acl.h +++ b/usr.sbin/ypserv/ypserv/acl.h @@ -1,4 +1,4 @@ -/* $OpenBSD: acl.h,v 1.2 1996/05/30 09:53:25 deraadt Exp $ */ +/* $OpenBSD: acl.h,v 1.3 1996/06/26 21:26:37 maja Exp $ */ /* * Copyright (c) 1994 Mats O Jansson <moj@stacken.kth.se> @@ -12,9 +12,11 @@ * 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 of the author may not be used to endorse or promote - * products derived from this software without specific prior written - * permission. + * 3. All advertising materials mentioning features or use of this software + * must display the following acknowledgement: + * This product includes software developed by Mats O Jansson + * 4. The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED diff --git a/usr.sbin/ypserv/ypserv/securenet.5 b/usr.sbin/ypserv/ypserv/securenet.5 index 2bb26d330c4..bb14ae718cf 100644 --- a/usr.sbin/ypserv/ypserv/securenet.5 +++ b/usr.sbin/ypserv/ypserv/securenet.5 @@ -1,4 +1,4 @@ -.\" $OpenBSD: securenet.5,v 1.3 1996/05/30 09:53:26 deraadt Exp $ +.\" $OpenBSD: securenet.5,v 1.4 1996/06/26 21:26:37 maja Exp $ .\" Copyright (c) 1994 Mats O Jansson <moj@stacken.kth.se> .\" All rights reserved. .\" @@ -10,9 +10,11 @@ .\" 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 of the author may not be used to endorse or promote -.\" products derived from this software without specific prior written -.\" permission. +.\" 3. All advertising materials mentioning features or use of this software +.\" must display the following acknowledgement: +.\" This product includes software developed by Mats O Jansson +.\" 4. The name of the author may not be used to endorse or promote products +.\" derived from this software without specific prior written permission. .\" .\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS .\" OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED diff --git a/usr.sbin/ypserv/ypserv/ypserv.8 b/usr.sbin/ypserv/ypserv/ypserv.8 index 9d234adf1bf..df3f4215dc6 100644 --- a/usr.sbin/ypserv/ypserv/ypserv.8 +++ b/usr.sbin/ypserv/ypserv/ypserv.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: ypserv.8,v 1.3 1996/05/30 09:53:27 deraadt Exp $ +.\" $OpenBSD: ypserv.8,v 1.4 1996/06/26 21:26:38 maja Exp $ .\" Copyright (c) 1994 Mats O Jansson <moj@stacken.kth.se> .\" All rights reserved. .\" @@ -10,9 +10,11 @@ .\" 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 of the author may not be used to endorse or promote -.\" products derived from this software without specific prior written -.\" permission. +.\" 3. All advertising materials mentioning features or use of this software +.\" must display the following acknowledgement: +.\" This product includes software developed by Mats O Jansson +.\" 4. The name of the author may not be used to endorse or promote products +.\" derived from this software without specific prior written permission. .\" .\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS .\" OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED diff --git a/usr.sbin/ypserv/ypserv/ypserv.acl.5 b/usr.sbin/ypserv/ypserv/ypserv.acl.5 index 59044a6aa71..2db4ba7e482 100644 --- a/usr.sbin/ypserv/ypserv/ypserv.acl.5 +++ b/usr.sbin/ypserv/ypserv/ypserv.acl.5 @@ -1,4 +1,4 @@ -.\" $OpenBSD: ypserv.acl.5,v 1.3 1996/05/30 09:53:28 deraadt Exp $ +.\" $OpenBSD: ypserv.acl.5,v 1.4 1996/06/26 21:26:38 maja Exp $ .\" Copyright (c) 1994 Mats O Jansson <moj@stacken.kth.se> .\" All rights reserved. .\" @@ -10,9 +10,11 @@ .\" 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 of the author may not be used to endorse or promote -.\" products derived from this software without specific prior written -.\" permission. +.\" 3. All advertising materials mentioning features or use of this software +.\" must display the following acknowledgement: +.\" This product includes software developed by Mats O Jansson +.\" 4. The name of the author may not be used to endorse or promote products +.\" derived from this software without specific prior written permission. .\" .\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS .\" OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED diff --git a/usr.sbin/ypserv/ypserv/ypserv.c b/usr.sbin/ypserv/ypserv/ypserv.c index 90fa69814c1..def9d56e503 100644 --- a/usr.sbin/ypserv/ypserv/ypserv.c +++ b/usr.sbin/ypserv/ypserv/ypserv.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ypserv.c,v 1.3 1996/05/30 09:53:29 deraadt Exp $ */ +/* $OpenBSD: ypserv.c,v 1.4 1996/06/26 21:26:38 maja Exp $ */ /* * Copyright (c) 1994 Mats O Jansson <moj@stacken.kth.se> @@ -12,9 +12,11 @@ * 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 of the author may not be used to endorse or promote - * products derived from this software without specific prior written - * permission. + * 3. All advertising materials mentioning features or use of this software + * must display the following acknowledgement: + * This product includes software developed by Mats O Jansson + * 4. The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED @@ -30,7 +32,7 @@ */ #ifndef LINT -static char rcsid[] = "$OpenBSD: ypserv.c,v 1.3 1996/05/30 09:53:29 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: ypserv.c,v 1.4 1996/06/26 21:26:38 maja Exp $"; #endif #include "yp.h" diff --git a/usr.sbin/ypserv/ypserv/ypserv_db.c b/usr.sbin/ypserv/ypserv/ypserv_db.c index 3378ba18f35..873a253f94a 100644 --- a/usr.sbin/ypserv/ypserv/ypserv_db.c +++ b/usr.sbin/ypserv/ypserv/ypserv_db.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ypserv_db.c,v 1.4 1996/05/30 09:53:29 deraadt Exp $ */ +/* $OpenBSD: ypserv_db.c,v 1.5 1996/06/26 21:26:39 maja Exp $ */ /* * Copyright (c) 1994 Mats O Jansson <moj@stacken.kth.se> @@ -13,9 +13,12 @@ * 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 of the author may not be used to endorse or promote - * products derived from this software without specific prior written - * permission. + * 3. All advertising materials mentioning features or use of this software + * must display the following acknowledgement: + * This product includes software developed by Mats O Jansson + * and Charles D. Cranor. + * 4. The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED @@ -31,7 +34,7 @@ */ #ifndef LINT -static char rcsid[] = "$OpenBSD: ypserv_db.c,v 1.4 1996/05/30 09:53:29 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: ypserv_db.c,v 1.5 1996/06/26 21:26:39 maja Exp $"; #endif /* @@ -58,6 +61,7 @@ static char rcsid[] = "$OpenBSD: ypserv_db.c,v 1.4 1996/05/30 09:53:29 deraadt E #include <sys/queue.h> #include <netinet/in.h> #include <arpa/inet.h> +#include <syslog.h> #include "yplog.h" #include "ypdb.h" #include "ypdef.h" @@ -376,6 +380,7 @@ lookup_host(nametable, host_lookup, db, keystr, result) struct in_addr *addr_name; struct in_addr addr_addr; static char val[BUFSIZ+1]; /* match libc */ + static hostname[MAXHOSTNAMELEN]; char *v; int l; char *ptr; @@ -413,6 +418,25 @@ lookup_host(nametable, host_lookup, db, keystr, result) inet_aton(keystr, &addr_addr); host = gethostbyaddr((char *) &addr_addr, sizeof(addr_addr), AF_INET); if (host == NULL) return(YP_NOKEY); + + strncpy((char *)hostname, host->h_name, sizeof(hostname) - 1); + hostname[sizeof(hostname) - 1] = '\0'; + host = gethostbyname((char *)hostname); + if (host == NULL) return(YP_NOKEY); + + l = 0; + for(; host->h_addr_list[0] != NULL; host->h_addr_list++) + if (!bcmp(host->h_addr_list[0], &addr_addr, sizeof(addr_addr))) + l++; + if (l == 0) { + yplog("lookup_host: address %s not listed for host %s\n", + inet_ntoa(addr_addr), hostname); + syslog(LOG_NOTICE, + "ypserv: address %s not listed for host %s\n", + inet_ntoa(addr_addr), hostname); + return(YP_NOKEY); + } + snprintf(val,sizeof(val),"%s %s",keystr,host->h_name); l = strlen(val); v = val + l; diff --git a/usr.sbin/ypserv/ypserv/ypserv_proc.c b/usr.sbin/ypserv/ypserv/ypserv_proc.c index f3f23c6153c..c5aee68ea98 100644 --- a/usr.sbin/ypserv/ypserv/ypserv_proc.c +++ b/usr.sbin/ypserv/ypserv/ypserv_proc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ypserv_proc.c,v 1.3 1996/05/30 09:53:30 deraadt Exp $ */ +/* $OpenBSD: ypserv_proc.c,v 1.4 1996/06/26 21:26:39 maja Exp $ */ /* * Copyright (c) 1994 Mats O Jansson <moj@stacken.kth.se> @@ -12,9 +12,11 @@ * 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 of the author may not be used to endorse or promote - * products derived from this software without specific prior written - * permission. + * 3. All advertising materials mentioning features or use of this software + * must display the following acknowledgement: + * This product includes software developed by Mats O Jansson + * 4. The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED @@ -30,7 +32,7 @@ */ #ifndef LINT -static char rcsid[] = "$OpenBSD: ypserv_proc.c,v 1.3 1996/05/30 09:53:30 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: ypserv_proc.c,v 1.4 1996/06/26 21:26:39 maja Exp $"; #endif #include <rpc/rpc.h> diff --git a/usr.sbin/ypserv/yptest/yptest.8 b/usr.sbin/ypserv/yptest/yptest.8 index 52fe6dcb111..76db7be1048 100644 --- a/usr.sbin/ypserv/yptest/yptest.8 +++ b/usr.sbin/ypserv/yptest/yptest.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: yptest.8,v 1.3 1996/05/30 09:53:32 deraadt Exp $ +.\" $OpenBSD: yptest.8,v 1.4 1996/06/26 21:26:40 maja Exp $ .\" Copyright (c) 1994 Mats O Jansson <moj@stacken.kth.se> .\" All rights reserved. .\" @@ -10,9 +10,11 @@ .\" 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 of the author may not be used to endorse or promote -.\" products derived from this software without specific prior written -.\" permission. +.\" 3. All advertising materials mentioning features or use of this software +.\" must display the following acknowledgement: +.\" This product includes software developed by Mats O Jansson +.\" 4. The name of the author may not be used to endorse or promote products +.\" derived from this software without specific prior written permission. .\" .\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS .\" OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED diff --git a/usr.sbin/ypserv/yptest/yptest.c b/usr.sbin/ypserv/yptest/yptest.c index acc32390a6e..5bd286fe637 100644 --- a/usr.sbin/ypserv/yptest/yptest.c +++ b/usr.sbin/ypserv/yptest/yptest.c @@ -1,4 +1,4 @@ -/* $OpenBSD: yptest.c,v 1.4 1996/05/30 09:53:33 deraadt Exp $ */ +/* $OpenBSD: yptest.c,v 1.5 1996/06/26 21:26:40 maja Exp $ */ /* * Copyright (c) 1994 Mats O Jansson <moj@stacken.kth.se> @@ -12,9 +12,11 @@ * 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 of the author may not be used to endorse or promote - * products derived from this software without specific prior written - * permission. + * 3. All advertising materials mentioning features or use of this software + * must display the following acknowledgement: + * This product includes software developed by Mats O Jansson + * 4. The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED @@ -30,7 +32,7 @@ */ #ifndef LINT -static char rcsid[] = "$OpenBSD: yptest.c,v 1.4 1996/05/30 09:53:33 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: yptest.c,v 1.5 1996/06/26 21:26:40 maja Exp $"; #endif #include <stdio.h> diff --git a/usr.sbin/ypserv/ypxfr/ypxfr.8 b/usr.sbin/ypserv/ypxfr/ypxfr.8 index a05cc6de1fa..58db984a9b0 100644 --- a/usr.sbin/ypserv/ypxfr/ypxfr.8 +++ b/usr.sbin/ypserv/ypxfr/ypxfr.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: ypxfr.8,v 1.3 1996/05/30 09:53:34 deraadt Exp $ +.\" $OpenBSD: ypxfr.8,v 1.4 1996/06/26 21:26:41 maja Exp $ .\" Copyright (c) 1994 Mats O Jansson <moj@stacken.kth.se> .\" All rights reserved. .\" @@ -10,9 +10,11 @@ .\" 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 of the author may not be used to endorse or promote -.\" products derived from this software without specific prior written -.\" permission. +.\" 3. All advertising materials mentioning features or use of this software +.\" must display the following acknowledgement: +.\" This product includes software developed by Mats O Jansson +.\" 4. The name of the author may not be used to endorse or promote products +.\" derived from this software without specific prior written permission. .\" .\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS .\" OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED @@ -26,7 +28,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $OpenBSD: ypxfr.8,v 1.3 1996/05/30 09:53:34 deraadt Exp $ +.\" $OpenBSD: ypxfr.8,v 1.4 1996/06/26 21:26:41 maja Exp $ .\" .Dd August 18, 1994 .Dt YPXFR 8 diff --git a/usr.sbin/ypserv/ypxfr/ypxfr_xdr.c b/usr.sbin/ypserv/ypxfr/ypxfr_xdr.c index e5701e8e546..cac16c4a2f0 100644 --- a/usr.sbin/ypserv/ypxfr/ypxfr_xdr.c +++ b/usr.sbin/ypserv/ypxfr/ypxfr_xdr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ypxfr_xdr.c,v 1.2 1996/05/30 09:53:35 deraadt Exp $ */ +/* $OpenBSD: ypxfr_xdr.c,v 1.3 1996/06/26 21:26:41 maja Exp $ */ /* * Copyright (c) 1995 Mats O Jansson <moj@stacken.kth.se> @@ -12,9 +12,11 @@ * 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 of the author may not be used to endorse or promote - * products derived from this software without specific prior written - * permission. + * 3. All advertising materials mentioning features or use of this software + * must display the following acknowledgement: + * This product includes software developed by Mats O Jansson + * 4. The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED @@ -30,7 +32,7 @@ */ #ifndef LINT -static char rcsid[] = "$OpenBSD: ypxfr_xdr.c,v 1.2 1996/05/30 09:53:35 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: ypxfr_xdr.c,v 1.3 1996/06/26 21:26:41 maja Exp $"; #endif |