diff options
| author | Damien Miller <djm@mindrot.org> | 2010-11-05 00:20:31 +0100 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2010-11-05 00:20:31 +0100 |
| commit | 07331211949938b0dce95d6a8aae1500da9f5750 (patch) | |
| tree | 6e10c9d520084fd40212a33d794c0fd5f3cc9408 /sftp-server.c | |
| parent | - jmc@cvs.openbsd.org 2010/10/28 18:33:28 (diff) | |
| download | openssh-07331211949938b0dce95d6a8aae1500da9f5750.tar.xz openssh-07331211949938b0dce95d6a8aae1500da9f5750.zip | |
- 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@
Diffstat (limited to '')
| -rw-r--r-- | sftp-server.c | 16 |
1 files changed, 8 insertions, 8 deletions
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: |