summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--sftp.c4
2 files changed, 3 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index ca7125bf8..23d407a4c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -32,7 +32,7 @@
32 [sftp-int.c] 32 [sftp-int.c]
33 Make put/get (globed and nonglobed) code more consistant. OK djm@ 33 Make put/get (globed and nonglobed) code more consistant. OK djm@
34 - mouring@cvs.openbsd.org 2003/05/15 03:43:59 34 - mouring@cvs.openbsd.org 2003/05/15 03:43:59
35 [sftp-int.c] 35 [sftp-int.c sftp.c]
36 Teach ls how to display multiple column display and allow users 36 Teach ls how to display multiple column display and allow users
37 to return to single column format via 'ls -1'. OK @djm 37 to return to single column format via 'ls -1'. OK @djm
38 - (djm) Always parse UsePAM 38 - (djm) Always parse UsePAM
@@ -1515,4 +1515,4 @@
1515 save auth method before monitor_reset_key_state(); bugzilla bug #284; 1515 save auth method before monitor_reset_key_state(); bugzilla bug #284;
1516 ok provos@ 1516 ok provos@
1517 1517
1518$Id: ChangeLog,v 1.2714 2003/05/15 03:49:21 djm Exp $ 1518$Id: ChangeLog,v 1.2715 2003/05/15 03:49:58 djm Exp $
diff --git a/sftp.c b/sftp.c
index e8adcba18..9597ca966 100644
--- a/sftp.c
+++ b/sftp.c
@@ -24,9 +24,7 @@
24 24
25#include "includes.h" 25#include "includes.h"
26 26
27RCSID("$OpenBSD: sftp.c,v 1.34 2003/01/10 08:19:07 fgsch Exp $"); 27RCSID("$OpenBSD: sftp.c,v 1.35 2003/05/15 03:44:00 mouring Exp $");
28
29/* XXX: short-form remote directory listings (like 'ls -C') */
30 28
31#include "buffer.h" 29#include "buffer.h"
32#include "xmalloc.h" 30#include "xmalloc.h"