summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--sftp-server.c4
2 files changed, 6 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 42ddf779a..0a733c295 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -38,6 +38,9 @@
38 - stevesk@cvs.openbsd.org 2007/01/03 04:09:15 38 - stevesk@cvs.openbsd.org 2007/01/03 04:09:15
39 [sftp.c] 39 [sftp.c]
40 ARGSUSED for lint 40 ARGSUSED for lint
41 - stevesk@cvs.openbsd.org 2007/01/03 07:22:36
42 [sftp-server.c]
43 spaces
41 44
4220061205 4520061205
43 - (djm) [auth.c] Fix NULL pointer dereference in fakepw(). Crash would 46 - (djm) [auth.c] Fix NULL pointer dereference in fakepw(). Crash would
@@ -2658,4 +2661,4 @@
2658 OpenServer 6 and add osr5bigcrypt support so when someone migrates 2661 OpenServer 6 and add osr5bigcrypt support so when someone migrates
2659 passwords between UnixWare and OpenServer they will still work. OK dtucker@ 2662 passwords between UnixWare and OpenServer they will still work. OK dtucker@
2660 2663
2661$Id: ChangeLog,v 1.4601 2007/01/05 05:30:41 djm Exp $ 2664$Id: ChangeLog,v 1.4602 2007/01/05 05:31:02 djm Exp $
diff --git a/sftp-server.c b/sftp-server.c
index c57958b0f..64777beff 100644
--- a/sftp-server.c
+++ b/sftp-server.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: sftp-server.c,v 1.70 2006/08/03 03:34:42 deraadt Exp $ */ 1/* $OpenBSD: sftp-server.c,v 1.71 2007/01/03 07:22:36 stevesk Exp $ */
2/* 2/*
3 * Copyright (c) 2000-2004 Markus Friedl. All rights reserved. 3 * Copyright (c) 2000-2004 Markus Friedl. All rights reserved.
4 * 4 *
@@ -663,7 +663,7 @@ process_fstat(void)
663 debug("request %u: fstat \"%s\" (handle %u)", 663 debug("request %u: fstat \"%s\" (handle %u)",
664 id, handle_to_name(handle), handle); 664 id, handle_to_name(handle), handle);
665 fd = handle_to_fd(handle); 665 fd = handle_to_fd(handle);
666 if (fd >= 0) { 666 if (fd >= 0) {
667 ret = fstat(fd, &st); 667 ret = fstat(fd, &st);
668 if (ret < 0) { 668 if (ret < 0) {
669 status = errno_to_portable(errno); 669 status = errno_to_portable(errno);