diff options
author | Colin Watson <cjwatson@debian.org> | 2010-01-24 22:46:54 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2010-01-24 22:46:54 +0000 |
commit | 59247ecde39f2d826a94ab07f6095ca1f6644e88 (patch) | |
tree | 5910d4a840352aafbf67e8a39fa63936e5529b26 /sftp-server.c | |
parent | 07d905b406c4ab64ea2f10a22f4f8f0d595269f6 (diff) | |
parent | 964476f91b66c475d5b8fa1e8b28d39a97a1b56e (diff) |
* New upstream release.
* Update to GSSAPI patch from
http://www.sxw.org.uk/computing/patches/openssh-5.3p1-gsskex-all-20100124.patch.
Diffstat (limited to 'sftp-server.c')
-rw-r--r-- | sftp-server.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sftp-server.c b/sftp-server.c index 24c4ff717..d984e6049 100644 --- a/sftp-server.c +++ b/sftp-server.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: sftp-server.c,v 1.84 2008/06/26 06:10:09 djm Exp $ */ | 1 | /* $OpenBSD: sftp-server.c,v 1.85 2009/04/14 16:33:42 stevesk 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 | * |
@@ -1041,7 +1041,7 @@ process_rename(void) | |||
1041 | else if (S_ISREG(sb.st_mode)) { | 1041 | else if (S_ISREG(sb.st_mode)) { |
1042 | /* Race-free rename of regular files */ | 1042 | /* Race-free rename of regular files */ |
1043 | if (link(oldpath, newpath) == -1) { | 1043 | if (link(oldpath, newpath) == -1) { |
1044 | if (errno == EOPNOTSUPP | 1044 | if (errno == EOPNOTSUPP || errno == ENOSYS |
1045 | #ifdef EXDEV | 1045 | #ifdef EXDEV |
1046 | || errno == EXDEV | 1046 | || errno == EXDEV |
1047 | #endif | 1047 | #endif |
@@ -1341,7 +1341,7 @@ sftp_server_main(int argc, char **argv, struct passwd *user_pw) | |||
1341 | __progname = ssh_get_progname(argv[0]); | 1341 | __progname = ssh_get_progname(argv[0]); |
1342 | log_init(__progname, log_level, log_facility, log_stderr); | 1342 | log_init(__progname, log_level, log_facility, log_stderr); |
1343 | 1343 | ||
1344 | while (!skipargs && (ch = getopt(argc, argv, "C:f:l:che")) != -1) { | 1344 | while (!skipargs && (ch = getopt(argc, argv, "f:l:che")) != -1) { |
1345 | switch (ch) { | 1345 | switch (ch) { |
1346 | case 'c': | 1346 | case 'c': |
1347 | /* | 1347 | /* |