diff options
Diffstat (limited to 'sftp-server.c')
-rw-r--r-- | sftp-server.c | 42 |
1 files changed, 34 insertions, 8 deletions
diff --git a/sftp-server.c b/sftp-server.c index a98ac2b6d..b268d0883 100644 --- a/sftp-server.c +++ b/sftp-server.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: sftp-server.c,v 1.91 2010/01/13 01:40:16 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 | ||
1225 | static void | 1228 | static void |
1229 | process_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 | |||
1249 | static void | ||
1226 | process_extended(void) | 1250 | process_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); |
@@ -1377,8 +1403,7 @@ sftp_server_main(int argc, char **argv, struct passwd *user_pw) | |||
1377 | ssize_t len, olen, set_size; | 1403 | ssize_t len, olen, set_size; |
1378 | SyslogFacility log_facility = SYSLOG_FACILITY_AUTH; | 1404 | SyslogFacility log_facility = SYSLOG_FACILITY_AUTH; |
1379 | char *cp, buf[4*4096]; | 1405 | char *cp, buf[4*4096]; |
1380 | const char *errmsg; | 1406 | long mask; |
1381 | mode_t mask; | ||
1382 | 1407 | ||
1383 | extern char *optarg; | 1408 | extern char *optarg; |
1384 | extern char *__progname; | 1409 | extern char *__progname; |
@@ -1412,11 +1437,12 @@ sftp_server_main(int argc, char **argv, struct passwd *user_pw) | |||
1412 | error("Invalid log facility \"%s\"", optarg); | 1437 | error("Invalid log facility \"%s\"", optarg); |
1413 | break; | 1438 | break; |
1414 | case 'u': | 1439 | case 'u': |
1415 | mask = (mode_t)strtonum(optarg, 0, 0777, &errmsg); | 1440 | errno = 0; |
1416 | if (errmsg != NULL) | 1441 | mask = strtol(optarg, &cp, 8); |
1417 | fatal("Invalid umask \"%s\": %s", | 1442 | if (mask < 0 || mask > 0777 || *cp != '\0' || |
1418 | optarg, errmsg); | 1443 | cp == optarg || (mask == 0 && errno != 0)) |
1419 | (void)umask(mask); | 1444 | fatal("Invalid umask \"%s\"", optarg); |
1445 | (void)umask((mode_t)mask); | ||
1420 | break; | 1446 | break; |
1421 | case 'h': | 1447 | case 'h': |
1422 | default: | 1448 | default: |