summaryrefslogtreecommitdiff
path: root/sftp-server.c
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2010-12-05 09:02:47 +1100
committerDarren Tucker <dtucker@zip.com.au>2010-12-05 09:02:47 +1100
commitaf1f90925494deba97a4b877798cf250f7dc75cf (patch)
treec6e44e388c2bd4ca0caad6ce9f422576fe650b57 /sftp-server.c
parentadab6f12992c522e1208fa2bdf89ce572840ccf8 (diff)
- djm@cvs.openbsd.org 2010/12/04 00:18:01
[sftp-server.c sftp.1 sftp-client.h sftp.c PROTOCOL sftp-client.c] add a protocol extension to support a hard link operation. It is available through the "ln" command in the client. The old "ln" behaviour of creating a symlink is available using its "-s" option or through the preexisting "symlink" command; based on a patch from miklos AT szeredi.hu in bz#1555; ok markus@
Diffstat (limited to 'sftp-server.c')
-rw-r--r--sftp-server.c28
1 files changed, 27 insertions, 1 deletions
diff --git a/sftp-server.c b/sftp-server.c
index 47edcd0aa..b268d0883 100644
--- a/sftp-server.c
+++ b/sftp-server.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: sftp-server.c,v 1.92 2010/11/04 02:45:34 djm Exp $ */ 1/* $OpenBSD: sftp-server.c,v 1.93 2010/12/04 00:18:01 djm Exp $ */
2/* 2/*
3 * Copyright (c) 2000-2004 Markus Friedl. All rights reserved. 3 * Copyright (c) 2000-2004 Markus Friedl. All rights reserved.
4 * 4 *
@@ -535,6 +535,9 @@ process_init(void)
535 /* fstatvfs extension */ 535 /* fstatvfs extension */
536 buffer_put_cstring(&msg, "fstatvfs@openssh.com"); 536 buffer_put_cstring(&msg, "fstatvfs@openssh.com");
537 buffer_put_cstring(&msg, "2"); /* version */ 537 buffer_put_cstring(&msg, "2"); /* version */
538 /* hardlink extension */
539 buffer_put_cstring(&msg, "hardlink@openssh.com");
540 buffer_put_cstring(&msg, "1"); /* version */
538 send_msg(&msg); 541 send_msg(&msg);
539 buffer_free(&msg); 542 buffer_free(&msg);
540} 543}
@@ -1223,6 +1226,27 @@ process_extended_fstatvfs(u_int32_t id)
1223} 1226}
1224 1227
1225static void 1228static void
1229process_extended_hardlink(u_int32_t id)
1230{
1231 char *oldpath, *newpath;
1232 int ret, status;
1233
1234 oldpath = get_string(NULL);
1235 newpath = get_string(NULL);
1236 debug3("request %u: hardlink", id);
1237 logit("hardlink old \"%s\" new \"%s\"", oldpath, newpath);
1238 if (readonly)
1239 status = SSH2_FX_PERMISSION_DENIED;
1240 else {
1241 ret = link(oldpath, newpath);
1242 status = (ret == -1) ? errno_to_portable(errno) : SSH2_FX_OK;
1243 }
1244 send_status(id, status);
1245 xfree(oldpath);
1246 xfree(newpath);
1247}
1248
1249static void
1226process_extended(void) 1250process_extended(void)
1227{ 1251{
1228 u_int32_t id; 1252 u_int32_t id;
@@ -1236,6 +1260,8 @@ process_extended(void)
1236 process_extended_statvfs(id); 1260 process_extended_statvfs(id);
1237 else if (strcmp(request, "fstatvfs@openssh.com") == 0) 1261 else if (strcmp(request, "fstatvfs@openssh.com") == 0)
1238 process_extended_fstatvfs(id); 1262 process_extended_fstatvfs(id);
1263 else if (strcmp(request, "hardlink@openssh.com") == 0)
1264 process_extended_hardlink(id);
1239 else 1265 else
1240 send_status(id, SSH2_FX_OP_UNSUPPORTED); /* MUST */ 1266 send_status(id, SSH2_FX_OP_UNSUPPORTED); /* MUST */
1241 xfree(request); 1267 xfree(request);