- djm@cvs.openbsd.org 2009/12/06 23:53:45

[openssh.git] / sftp-server.c

diff --git a/sftp-server.c b/sftp-server.c
index f699261640026db85c4d1fb1c176b42cb2e08cb0..20a601f99e370ea984c30b60fd10aa75bf28d894 100644 (file)
--- a/sftp-server.c
+++ b/sftp-server.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sftp-server.c,v 1.81 2008/06/07 21:52:46 djm Exp $ */
+/* $OpenBSD: sftp-server.c,v 1.88 2009/10/17 12:10:39 sobrado Exp $ */
 /*
  * Copyright (c) 2000-2004 Markus Friedl.  All rights reserved.
  *
@@ -104,6 +104,9 @@ errno_to_portable(int unixerrno)
        case EINVAL:
                ret = SSH2_FX_BAD_MESSAGE;
                break;
+       case ENOSYS:
+               ret = SSH2_FX_OP_UNSUPPORTED;
+               break;
        default:
                ret = SSH2_FX_FAILURE;
                break;
@@ -493,8 +496,8 @@ send_statvfs(u_int32_t id, struct statvfs *st)
        buffer_init(&msg);
        buffer_put_char(&msg, SSH2_FXP_EXTENDED_REPLY);
        buffer_put_int(&msg, id);
-       buffer_put_int(&msg, st->f_bsize);
-       buffer_put_int(&msg, st->f_frsize);
+       buffer_put_int64(&msg, st->f_bsize);
+       buffer_put_int64(&msg, st->f_frsize);
        buffer_put_int64(&msg, st->f_blocks);
        buffer_put_int64(&msg, st->f_bfree);
        buffer_put_int64(&msg, st->f_bavail);
@@ -502,8 +505,8 @@ send_statvfs(u_int32_t id, struct statvfs *st)
        buffer_put_int64(&msg, st->f_ffree);
        buffer_put_int64(&msg, st->f_favail);
        buffer_put_int64(&msg, FSID_TO_ULONG(st->f_fsid));
-       buffer_put_int(&msg, flag);
-       buffer_put_int(&msg, st->f_namemax);
+       buffer_put_int64(&msg, flag);
+       buffer_put_int64(&msg, st->f_namemax);
        send_msg(&msg);
        buffer_free(&msg);
 }
@@ -760,7 +763,7 @@ process_setstat(void)
        }
        if (a->flags & SSH2_FILEXFER_ATTR_PERMISSIONS) {
                logit("set \"%s\" mode %04o", name, a->perm);
-               ret = chmod(name, a->perm & 0777);
+               ret = chmod(name, a->perm & 07777);
                if (ret == -1)
                        status = errno_to_portable(errno);
        }
@@ -814,9 +817,9 @@ process_fsetstat(void)
                if (a->flags & SSH2_FILEXFER_ATTR_PERMISSIONS) {
                        logit("set \"%s\" mode %04o", name, a->perm);
 #ifdef HAVE_FCHMOD
-                       ret = fchmod(fd, a->perm & 0777);
+                       ret = fchmod(fd, a->perm & 07777);
 #else
-                       ret = chmod(name, a->perm & 0777);
+                       ret = chmod(name, a->perm & 07777);
 #endif
                        if (ret == -1)
                                status = errno_to_portable(errno);
@@ -967,7 +970,7 @@ process_mkdir(void)
        name = get_string(NULL);
        a = get_attrib();
        mode = (a->flags & SSH2_FILEXFER_ATTR_PERMISSIONS) ?
-           a->perm & 0777 : 0777;
+           a->perm & 07777 : 0777;
        debug3("request %u: mkdir", id);
        logit("mkdir name \"%s\" mode 0%o", name, mode);
        ret = mkdir(name, mode);
@@ -1038,7 +1041,10 @@ process_rename(void)
        else if (S_ISREG(sb.st_mode)) {
                /* Race-free rename of regular files */
                if (link(oldpath, newpath) == -1) {
-                       if (errno == EOPNOTSUPP
+                       if (errno == EOPNOTSUPP || errno == ENOSYS
+#ifdef EXDEV
+                           || errno == EXDEV
+#endif
 #ifdef LINK_OPNOTSUPP_ERRNO
                            || errno == LINK_OPNOTSUPP_ERRNO
 #endif
@@ -1316,7 +1322,8 @@ sftp_server_usage(void)
        extern char *__progname;
 
        fprintf(stderr,
-           "usage: %s [-he] [-l log_level] [-f log_facility]\n", __progname);
+           "usage: %s [-eh] [-f log_facility] [-l log_level] [-u umask]\n",
+           __progname);
        exit(1);
 }
 
@@ -1328,6 +1335,8 @@ sftp_server_main(int argc, char **argv, struct passwd *user_pw)
        ssize_t len, olen, set_size;
        SyslogFacility log_facility = SYSLOG_FACILITY_AUTH;
        char *cp, buf[4*4096];
+       const char *errmsg;
+       mode_t mask;
 
        extern char *optarg;
        extern char *__progname;
@@ -1335,7 +1344,7 @@ sftp_server_main(int argc, char **argv, struct passwd *user_pw)
        __progname = ssh_get_progname(argv[0]);
        log_init(__progname, log_level, log_facility, log_stderr);
 
-       while (!skipargs && (ch = getopt(argc, argv, "C:f:l:che")) != -1) {
+       while (!skipargs && (ch = getopt(argc, argv, "f:l:u:che")) != -1) {
                switch (ch) {
                case 'c':
                        /*
@@ -1357,6 +1366,13 @@ sftp_server_main(int argc, char **argv, struct passwd *user_pw)
                        if (log_facility == SYSLOG_FACILITY_NOT_SET)
                                error("Invalid log facility \"%s\"", optarg);
                        break;
+               case 'u':
+                       mask = (mode_t)strtonum(optarg, 0, 0777, &errmsg);
+                       if (errmsg != NULL)
+                               fatal("Invalid umask \"%s\": %s",
+                                   optarg, errmsg);
+                       (void)umask(mask);
+                       break;
                case 'h':
                default:
                        sftp_server_usage();