- stevesk@cvs.openbsd.org 2009/12/29 16:38:41

[openssh.git] / sftp-server.c

diff --git a/sftp-server.c b/sftp-server.c
index d144001bbbcdd607fdaef3d26d2bb72588f50e99..20a601f99e370ea984c30b60fd10aa75bf28d894 100644 (file)
--- a/sftp-server.c
+++ b/sftp-server.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sftp-server.c,v 1.86 2009/08/27 17:28:52 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.
  *
@@ -1322,7 +1322,7 @@ sftp_server_usage(void)
        extern char *__progname;
 
        fprintf(stderr,
-           "usage: %s [-he] [-l log_level] [-f log_facility] [-u umask]\n",
+           "usage: %s [-eh] [-f log_facility] [-l log_level] [-u umask]\n",
            __progname);
        exit(1);
 }
@@ -1368,7 +1368,7 @@ sftp_server_main(int argc, char **argv, struct passwd *user_pw)
                        break;
                case 'u':
                        mask = (mode_t)strtonum(optarg, 0, 0777, &errmsg);
-                       if (cp != NULL)
+                       if (errmsg != NULL)
                                fatal("Invalid umask \"%s\": %s",
                                    optarg, errmsg);
                        (void)umask(mask);