2 files changed, 12 insertions, 8 deletions

diff --git a/ChangeLog b/ChangeLog
index b58bd9184..27a1a64d6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -14,6 +14,10 @@
    - jmc@cvs.openbsd.org 2010/10/28 18:33:28
      [scp.1 ssh-add.1 ssh-keygen.1 ssh.1 ssh_config.5 sshd.8 sshd_config.5]
      knock out some "-*- nroff -*-" lines;
+   - djm@cvs.openbsd.org 2010/11/04 02:45:34
+     [sftp-server.c]
+     umask should be parsed as octal. reported by candland AT xmission.com;
+     ok markus@
 
 20101025
  - (tim) [openbsd-compat/glob.h] Remove sys/cdefs.h include that came with
diff --git a/sftp-server.c b/sftp-server.c
index a98ac2b6d..47edcd0aa 100644
--- a/sftp-server.c
+++ b/sftp-server.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sftp-server.c,v 1.91 2010/01/13 01:40:16 djm Exp $ */
+/* $OpenBSD: sftp-server.c,v 1.92 2010/11/04 02:45:34 djm Exp $ */
 /*
  * Copyright (c) 2000-2004 Markus Friedl.  All rights reserved.
  *
@@ -1377,8 +1377,7 @@ 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;
+        long mask;
 
         extern char *optarg;
         extern char *__progname;
@@ -1412,11 +1411,12 @@ sftp_server_main(int argc, char **argv, struct passwd *user_pw)
                                 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);
+                        errno = 0;
+                        mask = strtol(optarg, &cp, 8);
+                        if (mask < 0 || mask > 0777 || *cp != '\0' ||
+                            cp == optarg || (mask == 0 && errno != 0))
+                                fatal("Invalid umask \"%s\"", optarg);
+                        (void)umask((mode_t)mask);
                         break;
                 case 'h':
                 default: