diff options
-rw-r--r-- | ChangeLog | 3 | ||||
-rw-r--r-- | acconfig.h | 26 | ||||
-rw-r--r-- | defines.h | 26 | ||||
-rw-r--r-- | openbsd-compat/openbsd-compat.h | 26 |
4 files changed, 77 insertions, 4 deletions
@@ -1,5 +1,6 @@ | |||
1 | 20030611 | 1 | 20030611 |
2 | - (djm) Mention portable copyright holders in LICENSE | 2 | - (djm) Mention portable copyright holders in LICENSE |
3 | - (djm) Put licenses on substantial header files | ||
3 | - (djm) Sync LICENSE against OpenBSD | 4 | - (djm) Sync LICENSE against OpenBSD |
4 | - (djm) OpenBSD CVS Sync | 5 | - (djm) OpenBSD CVS Sync |
5 | - jmc@cvs.openbsd.org 2003/06/10 09:12:11 | 6 | - jmc@cvs.openbsd.org 2003/06/10 09:12:11 |
@@ -508,4 +509,4 @@ | |||
508 | - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. | 509 | - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. |
509 | Report from murple@murple.net, diagnosis from dtucker@zip.com.au | 510 | Report from murple@murple.net, diagnosis from dtucker@zip.com.au |
510 | 511 | ||
511 | $Id: ChangeLog,v 1.2799 2003/06/11 12:50:56 djm Exp $ | 512 | $Id: ChangeLog,v 1.2800 2003/06/11 12:51:32 djm Exp $ |
diff --git a/acconfig.h b/acconfig.h index 1f5109ba1..e6f5ebbbd 100644 --- a/acconfig.h +++ b/acconfig.h | |||
@@ -1,4 +1,28 @@ | |||
1 | /* $Id: acconfig.h,v 1.156 2003/06/04 23:53:31 djm Exp $ */ | 1 | /* $Id: acconfig.h,v 1.157 2003/06/11 12:51:32 djm Exp $ */ |
2 | |||
3 | /* | ||
4 | * Copyright (c) 1999-2003 Damien Miller. All rights reserved. | ||
5 | * | ||
6 | * Redistribution and use in source and binary forms, with or without | ||
7 | * modification, are permitted provided that the following conditions | ||
8 | * are met: | ||
9 | * 1. Redistributions of source code must retain the above copyright | ||
10 | * notice, this list of conditions and the following disclaimer. | ||
11 | * 2. Redistributions in binary form must reproduce the above copyright | ||
12 | * notice, this list of conditions and the following disclaimer in the | ||
13 | * documentation and/or other materials provided with the distribution. | ||
14 | * | ||
15 | * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR | ||
16 | * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES | ||
17 | * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. | ||
18 | * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, | ||
19 | * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT | ||
20 | * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | ||
21 | * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | ||
22 | * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
23 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | ||
24 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
25 | */ | ||
2 | 26 | ||
3 | #ifndef _CONFIG_H | 27 | #ifndef _CONFIG_H |
4 | #define _CONFIG_H | 28 | #define _CONFIG_H |
@@ -1,7 +1,31 @@ | |||
1 | /* | ||
2 | * Copyright (c) 1999-2003 Damien Miller. All rights reserved. | ||
3 | * | ||
4 | * Redistribution and use in source and binary forms, with or without | ||
5 | * modification, are permitted provided that the following conditions | ||
6 | * are met: | ||
7 | * 1. Redistributions of source code must retain the above copyright | ||
8 | * notice, this list of conditions and the following disclaimer. | ||
9 | * 2. Redistributions in binary form must reproduce the above copyright | ||
10 | * notice, this list of conditions and the following disclaimer in the | ||
11 | * documentation and/or other materials provided with the distribution. | ||
12 | * | ||
13 | * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR | ||
14 | * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES | ||
15 | * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. | ||
16 | * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, | ||
17 | * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT | ||
18 | * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | ||
19 | * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | ||
20 | * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
21 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | ||
22 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
23 | */ | ||
24 | |||
1 | #ifndef _DEFINES_H | 25 | #ifndef _DEFINES_H |
2 | #define _DEFINES_H | 26 | #define _DEFINES_H |
3 | 27 | ||
4 | /* $Id: defines.h,v 1.98 2003/04/28 23:30:43 mouring Exp $ */ | 28 | /* $Id: defines.h,v 1.99 2003/06/11 12:51:32 djm Exp $ */ |
5 | 29 | ||
6 | 30 | ||
7 | /* Constants */ | 31 | /* Constants */ |
diff --git a/openbsd-compat/openbsd-compat.h b/openbsd-compat/openbsd-compat.h index 2c97671b1..76862cc8a 100644 --- a/openbsd-compat/openbsd-compat.h +++ b/openbsd-compat/openbsd-compat.h | |||
@@ -1,4 +1,28 @@ | |||
1 | /* $Id: openbsd-compat.h,v 1.22 2003/06/05 08:52:48 djm Exp $ */ | 1 | /* |
2 | * Copyright (c) 1999-2003 Damien Miller. All rights reserved. | ||
3 | * | ||
4 | * Redistribution and use in source and binary forms, with or without | ||
5 | * modification, are permitted provided that the following conditions | ||
6 | * are met: | ||
7 | * 1. Redistributions of source code must retain the above copyright | ||
8 | * notice, this list of conditions and the following disclaimer. | ||
9 | * 2. Redistributions in binary form must reproduce the above copyright | ||
10 | * notice, this list of conditions and the following disclaimer in the | ||
11 | * documentation and/or other materials provided with the distribution. | ||
12 | * | ||
13 | * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR | ||
14 | * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES | ||
15 | * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. | ||
16 | * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, | ||
17 | * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT | ||
18 | * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | ||
19 | * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | ||
20 | * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
21 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | ||
22 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
23 | */ | ||
24 | |||
25 | /* $Id: openbsd-compat.h,v 1.23 2003/06/11 12:51:32 djm Exp $ */ | ||
2 | 26 | ||
3 | #ifndef _OPENBSD_H | 27 | #ifndef _OPENBSD_H |
4 | #define _OPENBSD_H | 28 | #define _OPENBSD_H |