summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rw-r--r--sftp-server.c5
2 files changed, 11 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 31abe27b1..f183a83e6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
120080609
2 - (dtucker) OpenBSD CVS Sync
3 - dtucker@cvs.openbsd.org 2008/06/08 17:04:41
4 [sftp-server.c]
5 Add case for ENOSYS in errno_to_portable; ok deraadt
6
120080608 720080608
2 - (dtucker) [configure.ac defines.h sftp-client.c sftp-server.c sftp.c 8 - (dtucker) [configure.ac defines.h sftp-client.c sftp-server.c sftp.c
3 openbsd-compat/Makefile.in openbsd-compat/openbsd-compat.h 9 openbsd-compat/Makefile.in openbsd-compat/openbsd-compat.h
@@ -4063,4 +4069,4 @@
4063 OpenServer 6 and add osr5bigcrypt support so when someone migrates 4069 OpenServer 6 and add osr5bigcrypt support so when someone migrates
4064 passwords between UnixWare and OpenServer they will still work. OK dtucker@ 4070 passwords between UnixWare and OpenServer they will still work. OK dtucker@
4065 4071
4066$Id: ChangeLog,v 1.4944 2008/06/08 20:17:53 dtucker Exp $ 4072$Id: ChangeLog,v 1.4945 2008/06/09 12:48:31 dtucker Exp $
diff --git a/sftp-server.c b/sftp-server.c
index f69926164..fbf620989 100644
--- a/sftp-server.c
+++ b/sftp-server.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: sftp-server.c,v 1.81 2008/06/07 21:52:46 djm Exp $ */ 1/* $OpenBSD: sftp-server.c,v 1.82 2008/06/08 17:04:41 dtucker 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 *
@@ -104,6 +104,9 @@ errno_to_portable(int unixerrno)
104 case EINVAL: 104 case EINVAL:
105 ret = SSH2_FX_BAD_MESSAGE; 105 ret = SSH2_FX_BAD_MESSAGE;
106 break; 106 break;
107 case ENOSYS:
108 ret = SSH2_FX_OP_UNSUPPORTED;
109 break;
107 default: 110 default:
108 ret = SSH2_FX_FAILURE; 111 ret = SSH2_FX_FAILURE;
109 break; 112 break;