diff options
-rw-r--r-- | ChangeLog | 8 | ||||
-rw-r--r-- | sftp-server.c | 32 |
2 files changed, 19 insertions, 21 deletions
@@ -1,3 +1,9 @@ | |||
1 | 20040224 | ||
2 | - (dtucker) OpenBSD CVS Sync | ||
3 | - markus@cvs.openbsd.org 2004/02/19 21:15:04 | ||
4 | [sftp-server.c] | ||
5 | switch to new license.template | ||
6 | |||
1 | 20040223 | 7 | 20040223 |
2 | - (dtucker) [session.c] Bug #789: Only make setcred call for !privsep in the | 8 | - (dtucker) [session.c] Bug #789: Only make setcred call for !privsep in the |
3 | non-interactive path. ok djm@ | 9 | non-interactive path. ok djm@ |
@@ -1900,4 +1906,4 @@ | |||
1900 | - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. | 1906 | - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. |
1901 | Report from murple@murple.net, diagnosis from dtucker@zip.com.au | 1907 | Report from murple@murple.net, diagnosis from dtucker@zip.com.au |
1902 | 1908 | ||
1903 | $Id: ChangeLog,v 1.3243 2004/02/23 13:01:27 dtucker Exp $ | 1909 | $Id: ChangeLog,v 1.3244 2004/02/23 22:19:15 dtucker Exp $ |
diff --git a/sftp-server.c b/sftp-server.c index d528a1d6e..1d13e97b2 100644 --- a/sftp-server.c +++ b/sftp-server.c | |||
@@ -1,28 +1,20 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (c) 2000, 2001, 2002 Markus Friedl. All rights reserved. | 2 | * Copyright (c) 2000-2004 Markus Friedl. All rights reserved. |
3 | * | 3 | * |
4 | * Redistribution and use in source and binary forms, with or without | 4 | * Permission to use, copy, modify, and distribute this software for any |
5 | * modification, are permitted provided that the following conditions | 5 | * purpose with or without fee is hereby granted, provided that the above |
6 | * are met: | 6 | * copyright notice and this permission notice appear in all copies. |
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 | * | 7 | * |
13 | * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR | 8 | * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES |
14 | * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES | 9 | * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF |
15 | * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. | 10 | * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR |
16 | * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, | 11 | * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES |
17 | * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT | 12 | * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN |
18 | * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | 13 | * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF |
19 | * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | 14 | * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. |
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 | */ | 15 | */ |
24 | #include "includes.h" | 16 | #include "includes.h" |
25 | RCSID("$OpenBSD: sftp-server.c,v 1.44 2003/11/10 16:23:41 jakob Exp $"); | 17 | RCSID("$OpenBSD: sftp-server.c,v 1.45 2004/02/19 21:15:04 markus Exp $"); |
26 | 18 | ||
27 | #include "buffer.h" | 19 | #include "buffer.h" |
28 | #include "bufaux.h" | 20 | #include "bufaux.h" |