- djm@cvs.openbsd.org 2008/06/26 06:10:09

[openssh.git] / sftp-server.c

diff --git a/sftp-server.c b/sftp-server.c
index 4022b93b604076f29874c5b4874a165a02d9450a..a4c4f168fc3f929827a04626f8ae579f8c6bae3f 100644 (file)
--- a/sftp-server.c
+++ b/sftp-server.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sftp-server.c,v 1.83 2008/06/09 13:02:39 dtucker Exp $ */
+/* $OpenBSD: sftp-server.c,v 1.84 2008/06/26 06:10:09 djm Exp $ */
 /*
  * Copyright (c) 2000-2004 Markus Friedl.  All rights reserved.
  *
@@ -763,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);
        }
@@ -817,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);
@@ -970,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);