aboutsummaryrefslogtreecommitdiff
path: root/libssh/sftp.c
diff options
context:
space:
mode:
authorAndreas Schneider <mail@cynapses.org>2009-07-28 11:47:53 +0200
committerAndreas Schneider <mail@cynapses.org>2009-07-28 13:25:26 +0200
commit69ceaae9a9f69dba11ab01889da5b41cb1487896 (patch)
treef32840e6c682e101107b2be40d64832e9c88da4f /libssh/sftp.c
parent1abdb28995fa5db61af7f385abf078c9b58fd843 (diff)
downloadlibssh-69ceaae9a9f69dba11ab01889da5b41cb1487896.tar.gz
libssh-69ceaae9a9f69dba11ab01889da5b41cb1487896.tar.xz
libssh-69ceaae9a9f69dba11ab01889da5b41cb1487896.zip
Check for OpenSSH and implement sftp_symlink correct.
When OpenSSH's sftp-server was implemented, the order of the arguments to the SSH_FXP_SYMLINK method was inadvertently reversed. Unfortunately, the reversal was not noticed until the server was widely deployed. Since fixing this to follow the specification would cause incompatibility, the current order was retained.
Diffstat (limited to 'libssh/sftp.c')
-rw-r--r--libssh/sftp.c30
1 files changed, 26 insertions, 4 deletions
diff --git a/libssh/sftp.c b/libssh/sftp.c
index f64aa302..41402810 100644
--- a/libssh/sftp.c
+++ b/libssh/sftp.c
@@ -2247,10 +2247,32 @@ int sftp_symlink(SFTP_SESSION *sftp, const char *target, const char *dest) {
}
id = sftp_get_new_id(sftp);
- if (buffer_add_u32(buffer, id) < 0 ||
- buffer_add_ssh_string(buffer, target_s) < 0 ||
- buffer_add_ssh_string(buffer, dest_s) < 0 ||
- sftp_packet_write(sftp, SSH_FXP_SYMLINK, buffer) < 0) {
+ if (buffer_add_u32(buffer, id) < 0) {
+ buffer_free(buffer);
+ string_free(dest_s);
+ string_free(target_s);
+ return -1;
+ }
+ if (ssh_get_openssh_version(sftp->session)) {
+ /* TODO check for version number if they ever fix it. */
+ if (buffer_add_ssh_string(buffer, target_s) < 0 ||
+ buffer_add_ssh_string(buffer, dest_s) < 0) {
+ buffer_free(buffer);
+ string_free(dest_s);
+ string_free(target_s);
+ return -1;
+ }
+ } else {
+ if (buffer_add_ssh_string(buffer, dest_s) < 0 ||
+ buffer_add_ssh_string(buffer, target_s) < 0) {
+ buffer_free(buffer);
+ string_free(dest_s);
+ string_free(target_s);
+ return -1;
+ }
+ }
+
+ if (sftp_packet_write(sftp, SSH_FXP_SYMLINK, buffer) < 0) {
buffer_free(buffer);
string_free(dest_s);
string_free(target_s);