From b62f1a856d3dc0b6d091e013500aa65c6173e0e5 Mon Sep 17 00:00:00 2001 From: Darren Tucker Date: Sun, 21 Jun 2009 17:53:48 +1000 Subject: - stevesk@cvs.openbsd.org 2009/04/14 16:33:42 [sftp-server.c] remove unused option character from getopt() optstring; ok markus@ --- sftp-server.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'sftp-server.c') diff --git a/sftp-server.c b/sftp-server.c index 24c4ff717..83beeadcf 100644 --- a/sftp-server.c +++ b/sftp-server.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sftp-server.c,v 1.84 2008/06/26 06:10:09 djm Exp $ */ +/* $OpenBSD: sftp-server.c,v 1.85 2009/04/14 16:33:42 stevesk Exp $ */ /* * Copyright (c) 2000-2004 Markus Friedl. All rights reserved. * @@ -1341,7 +1341,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, "C:f:l:che")) != -1) { + while (!skipargs && (ch = getopt(argc, argv, "f:l:che")) != -1) { switch (ch) { case 'c': /* -- cgit v1.2.3 From 0e26551f7fa8371ef067dec63ff46918bf87ad8d Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Fri, 28 Aug 2009 10:43:13 +1000 Subject: - (djm) [sftp-server.c] bz#1535: accept ENOSYS as a fallback error when attempting atomic rename(); ok dtucker@ --- ChangeLog | 2 ++ sftp-server.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'sftp-server.c') diff --git a/ChangeLog b/ChangeLog index 461f7c888..be206a44a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,8 @@ - (djm) [sshd_config.5] downgrade mention of login.conf to be an example and mention PAM as another provider for ChallengeResponseAuthentication; bz#1408; ok dtucker@ + - (djm) [sftp-server.c] bz#1535: accept ENOSYS as a fallback error when + attempting atomic rename(); ok dtucker@ 20090820 - (dtucker) [includes.h] Bug #1634: do not include system glob.h if we're not diff --git a/sftp-server.c b/sftp-server.c index 83beeadcf..d984e6049 100644 --- a/sftp-server.c +++ b/sftp-server.c @@ -1041,7 +1041,7 @@ process_rename(void) else if (S_ISREG(sb.st_mode)) { /* Race-free rename of regular files */ if (link(oldpath, newpath) == -1) { - if (errno == EOPNOTSUPP + if (errno == EOPNOTSUPP || errno == ENOSYS #ifdef EXDEV || errno == EXDEV #endif -- cgit v1.2.3