summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Lindstrom <mouring@eviladmin.org>2002-06-06 21:58:35 +0000
committerBen Lindstrom <mouring@eviladmin.org>2002-06-06 21:58:35 +0000
commit937df1d630fc6ef1e62b47e94cd5b665e7470a47 (patch)
tree53ec578f905a3a741b6101a99a72e78dfc6a4c62
parent2c14047ada68b35d877cafc93455d99c0749698b (diff)
- markus@cvs.openbsd.org 2002/06/06 17:30:11
[sftp-server.c] use get_int() macro (hide iqueue)
-rw-r--r--ChangeLog5
-rw-r--r--sftp-server.c4
2 files changed, 6 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index b6c16e0e0..70fdad614 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -127,6 +127,9 @@
127 - markus@cvs.openbsd.org 2002/06/06 17:12:44 127 - markus@cvs.openbsd.org 2002/06/06 17:12:44
128 [sftp-server.c] 128 [sftp-server.c]
129 discard remaining bytes of current request; ok provos@ 129 discard remaining bytes of current request; ok provos@
130 - markus@cvs.openbsd.org 2002/06/06 17:30:11
131 [sftp-server.c]
132 use get_int() macro (hide iqueue)
130 133
13120020604 13420020604
132 - (stevesk) [channels.c] bug #164 patch from YOSHIFUJI Hideaki (changed 135 - (stevesk) [channels.c] bug #164 patch from YOSHIFUJI Hideaki (changed
@@ -811,4 +814,4 @@
811 - (stevesk) entropy.c: typo in debug message 814 - (stevesk) entropy.c: typo in debug message
812 - (djm) ssh-keygen -i needs seeded RNG; report from markus@ 815 - (djm) ssh-keygen -i needs seeded RNG; report from markus@
813 816
814$Id: ChangeLog,v 1.2178 2002/06/06 21:57:54 mouring Exp $ 817$Id: ChangeLog,v 1.2179 2002/06/06 21:58:35 mouring Exp $
diff --git a/sftp-server.c b/sftp-server.c
index beb251a8a..9db28e7d3 100644
--- a/sftp-server.c
+++ b/sftp-server.c
@@ -22,7 +22,7 @@
22 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 22 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
23 */ 23 */
24#include "includes.h" 24#include "includes.h"
25RCSID("$OpenBSD: sftp-server.c,v 1.34 2002/06/06 17:12:44 markus Exp $"); 25RCSID("$OpenBSD: sftp-server.c,v 1.35 2002/06/06 17:30:11 markus Exp $");
26 26
27#include "buffer.h" 27#include "buffer.h"
28#include "bufaux.h" 28#include "bufaux.h"
@@ -368,7 +368,7 @@ process_init(void)
368{ 368{
369 Buffer msg; 369 Buffer msg;
370 370
371 version = buffer_get_int(&iqueue); 371 version = get_int();
372 TRACE("client version %d", version); 372 TRACE("client version %d", version);
373 buffer_init(&msg); 373 buffer_init(&msg);
374 buffer_put_char(&msg, SSH2_FXP_VERSION); 374 buffer_put_char(&msg, SSH2_FXP_VERSION);