diff options
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | scp.c | 8 |
2 files changed, 7 insertions, 7 deletions
@@ -11,6 +11,10 @@ | |||
11 | a UseDNS option, UseDNS is on by default and includes the | 11 | a UseDNS option, UseDNS is on by default and includes the |
12 | VerifyReverseMapping check; with itojun@, provos@, jakob@ and deraadt@ | 12 | VerifyReverseMapping check; with itojun@, provos@, jakob@ and deraadt@ |
13 | ok deraadt@, djm@ | 13 | ok deraadt@, djm@ |
14 | - millert@cvs.openbsd.org 2003/06/03 02:56:16 | ||
15 | [scp.c] | ||
16 | Remove the advertising clause in the UCB license which Berkeley | ||
17 | rescinded 22 July 1999. Proofed by myself and Theo. | ||
14 | - (djm) Fix portable-specific uses of verify_reverse_mapping too | 18 | - (djm) Fix portable-specific uses of verify_reverse_mapping too |
15 | - (djm) Sync openbsd-compat with OpenBSD CVS. | 19 | - (djm) Sync openbsd-compat with OpenBSD CVS. |
16 | - No more 4-term BSD licenses in our tree | 20 | - No more 4-term BSD licenses in our tree |
@@ -421,4 +425,4 @@ | |||
421 | - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. | 425 | - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. |
422 | Report from murple@murple.net, diagnosis from dtucker@zip.com.au | 426 | Report from murple@murple.net, diagnosis from dtucker@zip.com.au |
423 | 427 | ||
424 | $Id: ChangeLog,v 1.2768 2003/06/03 02:45:27 dtucker Exp $ | 428 | $Id: ChangeLog,v 1.2769 2003/06/03 03:06:18 djm Exp $ |
@@ -52,11 +52,7 @@ | |||
52 | * 2. Redistributions in binary form must reproduce the above copyright | 52 | * 2. Redistributions in binary form must reproduce the above copyright |
53 | * notice, this list of conditions and the following disclaimer in the | 53 | * notice, this list of conditions and the following disclaimer in the |
54 | * documentation and/or other materials provided with the distribution. | 54 | * documentation and/or other materials provided with the distribution. |
55 | * 3. All advertising materials mentioning features or use of this software | 55 | * 3. Neither the name of the University nor the names of its contributors |
56 | * must display the following acknowledgement: | ||
57 | * This product includes software developed by the University of | ||
58 | * California, Berkeley and its contributors. | ||
59 | * 4. Neither the name of the University nor the names of its contributors | ||
60 | * may be used to endorse or promote products derived from this software | 56 | * may be used to endorse or promote products derived from this software |
61 | * without specific prior written permission. | 57 | * without specific prior written permission. |
62 | * | 58 | * |
@@ -75,7 +71,7 @@ | |||
75 | */ | 71 | */ |
76 | 72 | ||
77 | #include "includes.h" | 73 | #include "includes.h" |
78 | RCSID("$OpenBSD: scp.c,v 1.102 2003/03/05 22:33:43 markus Exp $"); | 74 | RCSID("$OpenBSD: scp.c,v 1.103 2003/06/03 02:56:16 millert Exp $"); |
79 | 75 | ||
80 | #include "xmalloc.h" | 76 | #include "xmalloc.h" |
81 | #include "atomicio.h" | 77 | #include "atomicio.h" |