diff options
-rw-r--r-- | ChangeLog | 3 | ||||
-rw-r--r-- | sftp-server.c | 4 |
2 files changed, 5 insertions, 2 deletions
@@ -67,6 +67,9 @@ | |||
67 | migration measure back in 2002 when constraints were new, but just | 67 | migration measure back in 2002 when constraints were new, but just |
68 | adds risk now. | 68 | adds risk now. |
69 | bz #1612, report and patch from dkg AT fifthhorseman.net; ok markus@ | 69 | bz #1612, report and patch from dkg AT fifthhorseman.net; ok markus@ |
70 | - djm@cvs.openbsd.org 2009/08/31 20:56:02 | ||
71 | [sftp-server.c] | ||
72 | check correct variable for error message, spotted by martynas@ | ||
70 | 73 | ||
71 | 20091002 | 74 | 20091002 |
72 | - (djm) [Makefile.in] Mention readconf.o in ssh-keysign's make deps. | 75 | - (djm) [Makefile.in] Mention readconf.o in ssh-keysign's make deps. |
diff --git a/sftp-server.c b/sftp-server.c index d144001bb..66c0c1d5f 100644 --- a/sftp-server.c +++ b/sftp-server.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: sftp-server.c,v 1.86 2009/08/27 17:28:52 djm Exp $ */ | 1 | /* $OpenBSD: sftp-server.c,v 1.87 2009/08/31 20:56:02 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 | * |
@@ -1368,7 +1368,7 @@ sftp_server_main(int argc, char **argv, struct passwd *user_pw) | |||
1368 | break; | 1368 | break; |
1369 | case 'u': | 1369 | case 'u': |
1370 | mask = (mode_t)strtonum(optarg, 0, 0777, &errmsg); | 1370 | mask = (mode_t)strtonum(optarg, 0, 0777, &errmsg); |
1371 | if (cp != NULL) | 1371 | if (errmsg != NULL) |
1372 | fatal("Invalid umask \"%s\": %s", | 1372 | fatal("Invalid umask \"%s\": %s", |
1373 | optarg, errmsg); | 1373 | optarg, errmsg); |
1374 | (void)umask(mask); | 1374 | (void)umask(mask); |