diff options
author | Darren Tucker <dtucker@zip.com.au> | 2008-06-13 07:01:29 +1000 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2008-06-13 07:01:29 +1000 |
commit | a64ab33f048fd8649c35e1142592d448e0d9eb6a (patch) | |
tree | 640b5368b043190827c292bcec59d641e2106300 | |
parent | 3fc464efdc5111334f42213891521fcd42c0e7a1 (diff) |
- djm@cvs.openbsd.org 2008/06/12 20:47:04
[sftp-client.c]
print extension revisions for extensions that we understand
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | sftp-client.c | 24 |
2 files changed, 21 insertions, 8 deletions
@@ -122,6 +122,9 @@ | |||
122 | [sshd.c sshconnect.c packet.h misc.c misc.h packet.c] | 122 | [sshd.c sshconnect.c packet.h misc.c misc.h packet.c] |
123 | Make keepalive timeouts apply while waiting for a packet, particularly | 123 | Make keepalive timeouts apply while waiting for a packet, particularly |
124 | during key renegotiation (bz #1363). With djm and Matt Day, ok djm@ | 124 | during key renegotiation (bz #1363). With djm and Matt Day, ok djm@ |
125 | - djm@cvs.openbsd.org 2008/06/12 20:47:04 | ||
126 | [sftp-client.c] | ||
127 | print extension revisions for extensions that we understand | ||
125 | - (dtucker) [clientloop.c serverloop.c] channel_register_filter now | 128 | - (dtucker) [clientloop.c serverloop.c] channel_register_filter now |
126 | takes 2 more args. with djm@ | 129 | takes 2 more args. with djm@ |
127 | 130 | ||
@@ -4286,4 +4289,4 @@ | |||
4286 | OpenServer 6 and add osr5bigcrypt support so when someone migrates | 4289 | OpenServer 6 and add osr5bigcrypt support so when someone migrates |
4287 | passwords between UnixWare and OpenServer they will still work. OK dtucker@ | 4290 | passwords between UnixWare and OpenServer they will still work. OK dtucker@ |
4288 | 4291 | ||
4289 | $Id: ChangeLog,v 1.4988 2008/06/12 20:42:45 dtucker Exp $ | 4292 | $Id: ChangeLog,v 1.4989 2008/06/12 21:01:29 dtucker Exp $ |
diff --git a/sftp-client.c b/sftp-client.c index 8d0666b85..2565a704d 100644 --- a/sftp-client.c +++ b/sftp-client.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: sftp-client.c,v 1.84 2008/06/08 20:15:29 dtucker Exp $ */ | 1 | /* $OpenBSD: sftp-client.c,v 1.85 2008/06/12 20:47:04 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org> | 3 | * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org> |
4 | * | 4 | * |
@@ -326,17 +326,27 @@ do_init(int fd_in, int fd_out, u_int transfer_buflen, u_int num_requests) | |||
326 | while (buffer_len(&msg) > 0) { | 326 | while (buffer_len(&msg) > 0) { |
327 | char *name = buffer_get_string(&msg, NULL); | 327 | char *name = buffer_get_string(&msg, NULL); |
328 | char *value = buffer_get_string(&msg, NULL); | 328 | char *value = buffer_get_string(&msg, NULL); |
329 | int known = 0; | ||
329 | 330 | ||
330 | debug2("Init extension: \"%s\"", name); | ||
331 | if (strcmp(name, "posix-rename@openssh.com") == 0 && | 331 | if (strcmp(name, "posix-rename@openssh.com") == 0 && |
332 | strcmp(value, "1") == 0) | 332 | strcmp(value, "1") == 0) { |
333 | exts |= SFTP_EXT_POSIX_RENAME; | 333 | exts |= SFTP_EXT_POSIX_RENAME; |
334 | if (strcmp(name, "statvfs@openssh.com") == 0 && | 334 | known = 1; |
335 | strcmp(value, "2") == 0) | 335 | } else if (strcmp(name, "statvfs@openssh.com") == 0 && |
336 | strcmp(value, "2") == 0) { | ||
336 | exts |= SFTP_EXT_STATVFS; | 337 | exts |= SFTP_EXT_STATVFS; |
337 | if (strcmp(name, "fstatvfs@openssh.com") == 0 && | 338 | known = 1; |
338 | strcmp(value, "2") == 0) | 339 | } if (strcmp(name, "fstatvfs@openssh.com") == 0 && |
340 | strcmp(value, "2") == 0) { | ||
339 | exts |= SFTP_EXT_FSTATVFS; | 341 | exts |= SFTP_EXT_FSTATVFS; |
342 | known = 1; | ||
343 | } | ||
344 | if (known) { | ||
345 | debug2("Server supports extension \"%s\" revision %s", | ||
346 | name, value); | ||
347 | } else { | ||
348 | debug2("Unrecognised server extension \"%s\"", name); | ||
349 | } | ||
340 | xfree(name); | 350 | xfree(name); |
341 | xfree(value); | 351 | xfree(value); |
342 | } | 352 | } |