summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--sftp-common.c4
2 files changed, 6 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index d9bb0eb9d..eb65e05cf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -47,6 +47,9 @@
47 - markus@cvs.openbsd.org 2001/12/01 21:41:48 47 - markus@cvs.openbsd.org 2001/12/01 21:41:48
48 [session.c sshd.8] 48 [session.c sshd.8]
49 don't pass user defined variables to /usr/bin/login 49 don't pass user defined variables to /usr/bin/login
50 - deraadt@cvs.openbsd.org 2001/12/02 02:08:32
51 [sftp-common.c]
52 zap };
50 53
5120011126 5420011126
52 - (tim) [contrib/cygwin/README, openbsd-compat/bsd-cygwin_util.c, 55 - (tim) [contrib/cygwin/README, openbsd-compat/bsd-cygwin_util.c,
@@ -6969,4 +6972,4 @@
6969 - Wrote replacements for strlcpy and mkdtemp 6972 - Wrote replacements for strlcpy and mkdtemp
6970 - Released 1.0pre1 6973 - Released 1.0pre1
6971 6974
6972$Id: ChangeLog,v 1.1680 2001/12/06 17:47:47 mouring Exp $ 6975$Id: ChangeLog,v 1.1681 2001/12/06 17:50:03 mouring Exp $
diff --git a/sftp-common.c b/sftp-common.c
index 923504811..4fb449655 100644
--- a/sftp-common.c
+++ b/sftp-common.c
@@ -24,7 +24,7 @@
24 */ 24 */
25 25
26#include "includes.h" 26#include "includes.h"
27RCSID("$OpenBSD: sftp-common.c,v 1.4 2001/07/14 15:10:17 stevesk Exp $"); 27RCSID("$OpenBSD: sftp-common.c,v 1.5 2001/12/02 02:08:32 deraadt Exp $");
28 28
29#include "buffer.h" 29#include "buffer.h"
30#include "bufaux.h" 30#include "bufaux.h"
@@ -144,6 +144,6 @@ fx2txt(int status)
144 return("Operation unsupported"); 144 return("Operation unsupported");
145 default: 145 default:
146 return("Unknown status"); 146 return("Unknown status");
147 }; 147 }
148 /* NOTREACHED */ 148 /* NOTREACHED */
149} 149}