- (dtucker) Wrap use of IPPROTO_IPV6 in an ifdef for platforms that don't

[openssh.git] / sftp-server.c

diff --git a/sftp-server.c b/sftp-server.c
index d984e60493b3994bdbd0b84e530c8dc00b1646ad..cf4e273f8403c07dcfdaaf5da6ccb78ec03440f8 100644 (file)
--- a/sftp-server.c
+++ b/sftp-server.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sftp-server.c,v 1.85 2009/04/14 16:33:42 stevesk Exp $ */
+/* $OpenBSD: sftp-server.c,v 1.89 2010/01/04 02:25:15 djm Exp $ */
 /*
  * Copyright (c) 2000-2004 Markus Friedl.  All rights reserved.
  *
@@ -1322,7 +1322,8 @@ sftp_server_usage(void)
        extern char *__progname;
 
        fprintf(stderr,
-           "usage: %s [-he] [-l log_level] [-f log_facility]\n", __progname);
+           "usage: %s [-eh] [-f log_facility] [-l log_level] [-u umask]\n",
+           __progname);
        exit(1);
 }
 
@@ -1334,6 +1335,8 @@ 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;
 
        extern char *optarg;
        extern char *__progname;
@@ -1341,7 +1344,7 @@ sftp_server_main(int argc, char **argv, struct passwd *user_pw)
        __progname = ssh_get_progname(argv[0]);
        log_init(__progname, log_level, log_facility, log_stderr);
 
-       while (!skipargs && (ch = getopt(argc, argv, "f:l:che")) != -1) {
+       while (!skipargs && (ch = getopt(argc, argv, "f:l:u:che")) != -1) {
                switch (ch) {
                case 'c':
                        /*
@@ -1363,6 +1366,13 @@ sftp_server_main(int argc, char **argv, struct passwd *user_pw)
                        if (log_facility == SYSLOG_FACILITY_NOT_SET)
                                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);
+                       break;
                case 'h':
                default:
                        sftp_server_usage();
@@ -1387,8 +1397,8 @@ sftp_server_main(int argc, char **argv, struct passwd *user_pw)
        logit("session opened for local user %s from [%s]",
            pw->pw_name, client_addr);
 
-       in = dup(STDIN_FILENO);
-       out = dup(STDOUT_FILENO);
+       in = STDIN_FILENO;
+       out = STDOUT_FILENO;
 
 #ifdef HAVE_CYGWIN
        setmode(in, O_BINARY);