summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2003-06-14 08:43:22 +1000
committerDamien Miller <djm@mindrot.org>2003-06-14 08:43:22 +1000
commit53950b68bf28a8d3eebdf39bea96a9046806c5d2 (patch)
tree7045832ca5dcc35e08267c0c5d38cab186827ee4
parentbc976f92d33aa1e13740a193b77fd3694d96b344 (diff)
- (djm) Update license on fake-rfc2553.[ch]; ok itojun@
-rw-r--r--ChangeLog5
-rw-r--r--openbsd-compat/fake-rfc2553.c31
-rw-r--r--openbsd-compat/fake-rfc2553.h31
3 files changed, 64 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index c96dfb94f..deb0c6335 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
120030614
2 - (djm) Update license on fake-rfc2553.[ch]; ok itojun@
3
120030611 420030611
2 - (djm) Mention portable copyright holders in LICENSE 5 - (djm) Mention portable copyright holders in LICENSE
3 - (djm) Put licenses on substantial header files 6 - (djm) Put licenses on substantial header files
@@ -509,4 +512,4 @@
509 - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. 512 - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
510 Report from murple@murple.net, diagnosis from dtucker@zip.com.au 513 Report from murple@murple.net, diagnosis from dtucker@zip.com.au
511 514
512$Id: ChangeLog,v 1.2800 2003/06/11 12:51:32 djm Exp $ 515$Id: ChangeLog,v 1.2801 2003/06/13 22:43:22 djm Exp $
diff --git a/openbsd-compat/fake-rfc2553.c b/openbsd-compat/fake-rfc2553.c
index b544e3547..f44924836 100644
--- a/openbsd-compat/fake-rfc2553.c
+++ b/openbsd-compat/fake-rfc2553.c
@@ -1,4 +1,33 @@
1/* 1/*
2 * Copyright (C) 2000-2003 Damien Miller. All rights reserved.
3 * Copyright (C) 1999 WIDE Project. All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright
11 * notice, this list of conditions and the following disclaimer in the
12 * documentation and/or other materials provided with the distribution.
13 * 3. Neither the name of the project nor the names of its contributors
14 * may be used to endorse or promote products derived from this software
15 * without specific prior written permission.
16 *
17 * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
18 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
19 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
20 * ARE DISCLAIMED. IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE
21 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
22 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
23 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
24 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
25 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
26 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
27 * SUCH DAMAGE.
28 */
29
30/*
2 * Pseudo-implementation of RFC2553 name / address resolution functions 31 * Pseudo-implementation of RFC2553 name / address resolution functions
3 * 32 *
4 * But these functions are not implemented correctly. The minimum subset 33 * But these functions are not implemented correctly. The minimum subset
@@ -8,7 +37,7 @@
8 37
9#include "includes.h" 38#include "includes.h"
10 39
11RCSID("$Id: fake-rfc2553.c,v 1.3 2003/06/11 13:56:41 dtucker Exp $"); 40RCSID("$Id: fake-rfc2553.c,v 1.4 2003/06/13 22:43:23 djm Exp $");
12 41
13#ifndef HAVE_GETNAMEINFO 42#ifndef HAVE_GETNAMEINFO
14int getnameinfo(const struct sockaddr *sa, size_t salen, char *host, 43int getnameinfo(const struct sockaddr *sa, size_t salen, char *host,
diff --git a/openbsd-compat/fake-rfc2553.h b/openbsd-compat/fake-rfc2553.h
index 85022f9da..dbf15bb38 100644
--- a/openbsd-compat/fake-rfc2553.h
+++ b/openbsd-compat/fake-rfc2553.h
@@ -1,4 +1,33 @@
1/* 1/*
2 * Copyright (C) 2000-2003 Damien Miller. All rights reserved.
3 * Copyright (C) 1999 WIDE Project. All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright
11 * notice, this list of conditions and the following disclaimer in the
12 * documentation and/or other materials provided with the distribution.
13 * 3. Neither the name of the project nor the names of its contributors
14 * may be used to endorse or promote products derived from this software
15 * without specific prior written permission.
16 *
17 * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
18 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
19 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
20 * ARE DISCLAIMED. IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE
21 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
22 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
23 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
24 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
25 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
26 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
27 * SUCH DAMAGE.
28 */
29
30/*
2 * Pseudo-implementation of RFC2553 name / address resolution functions 31 * Pseudo-implementation of RFC2553 name / address resolution functions
3 * 32 *
4 * But these functions are not implemented correctly. The minimum subset 33 * But these functions are not implemented correctly. The minimum subset
@@ -6,7 +35,7 @@
6 * that ai_family is AF_INET. Don't use it for another purpose. 35 * that ai_family is AF_INET. Don't use it for another purpose.
7 */ 36 */
8 37
9/* $Id: fake-rfc2553.h,v 1.3 2003/06/11 13:56:41 dtucker Exp $ */ 38/* $Id: fake-rfc2553.h,v 1.4 2003/06/13 22:43:23 djm Exp $ */
10 39
11#ifndef _FAKE_RFC2553_H 40#ifndef _FAKE_RFC2553_H
12#define _FAKE_RFC2553_H 41#define _FAKE_RFC2553_H