From 3f9fdc71219d498a996c4e4ca8330df7f598fb5d Mon Sep 17 00:00:00 2001
From: Darren Tucker <dtucker@zip.com.au>
Date: Tue, 22 Jun 2004 12:56:01 +1000
Subject:    - avsm@cvs.openbsd.org 2004/06/21 17:36:31      [auth-rsa.c
 auth2-gss.c auth2-pubkey.c authfile.c canohost.c channels.c      cipher.c
 dns.c kex.c monitor.c monitor_fdpass.c monitor_wrap.c      monitor_wrap.h
 nchan.c packet.c progressmeter.c scp.c sftp-server.c sftp.c      ssh-gss.h
 ssh-keygen.c ssh.c sshconnect.c sshconnect1.c sshlogin.c      sshpty.c]     
 make ssh -Wshadow clean, no functional changes      markus@ ok

There are also some portable-specific -Wshadow warnings to be fixed in
monitor.c and montior_wrap.c.
---
 sftp-server.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'sftp-server.c')

diff --git a/sftp-server.c b/sftp-server.c
index 1d13e97b2..8349c1763 100644
--- a/sftp-server.c
+++ b/sftp-server.c
@@ -14,7 +14,7 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 #include "includes.h"
-RCSID("$OpenBSD: sftp-server.c,v 1.45 2004/02/19 21:15:04 markus Exp $");
+RCSID("$OpenBSD: sftp-server.c,v 1.46 2004/06/21 17:36:31 avsm Exp $");
 
 #include "buffer.h"
 #include "bufaux.h"
@@ -260,7 +260,7 @@ send_msg(Buffer *m)
 }
 
 static void
-send_status(u_int32_t id, u_int32_t error)
+send_status(u_int32_t id, u_int32_t status)
 {
 	Buffer msg;
 	const char *status_messages[] = {
@@ -276,14 +276,14 @@ send_status(u_int32_t id, u_int32_t error)
 		"Unknown error"			/* Others */
 	};
 
-	TRACE("sent status id %u error %u", id, error);
+	TRACE("sent status id %u error %u", id, status);
 	buffer_init(&msg);
 	buffer_put_char(&msg, SSH2_FXP_STATUS);
 	buffer_put_int(&msg, id);
-	buffer_put_int(&msg, error);
+	buffer_put_int(&msg, status);
 	if (version >= 3) {
 		buffer_put_cstring(&msg,
-		    status_messages[MIN(error,SSH2_FX_MAX)]);
+		    status_messages[MIN(status,SSH2_FX_MAX)]);
 		buffer_put_cstring(&msg, "");
 	}
 	send_msg(&msg);
@@ -863,20 +863,20 @@ process_readlink(void)
 {
 	u_int32_t id;
 	int len;
-	char link[MAXPATHLEN];
+	char buf[MAXPATHLEN];
 	char *path;
 
 	id = get_int();
 	path = get_string(NULL);
 	TRACE("readlink id %u path %s", id, path);
-	if ((len = readlink(path, link, sizeof(link) - 1)) == -1)
+	if ((len = readlink(path, buf, sizeof(buf) - 1)) == -1)
 		send_status(id, errno_to_portable(errno));
 	else {
 		Stat s;
 
-		link[len] = '\0';
+		buf[len] = '\0';
 		attrib_clear(&s.attrib);
-		s.name = s.long_name = link;
+		s.name = s.long_name = buf;
 		send_names(id, 1, &s);
 	}
 	xfree(path);
-- 
cgit v1.2.3


From aedc1d6a3ed351d11514b9bdf52456ff27dc16bc Mon Sep 17 00:00:00 2001
From: Darren Tucker <dtucker@zip.com.au>
Date: Fri, 25 Jun 2004 17:06:02 +1000
Subject:    - dtucker@cvs.openbsd.org 2004/06/25 05:38:48      [sftp-server.c]
      Fall back to stat+rename if filesystem doesn't doesn't support hard     
 links.  bz#823, ok djm@

---
 ChangeLog     |  6 +++++-
 sftp-server.c | 24 ++++++++++++++++++++----
 2 files changed, 25 insertions(+), 5 deletions(-)

(limited to 'sftp-server.c')

diff --git a/ChangeLog b/ChangeLog
index 94172428a..1252df061 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -14,6 +14,10 @@
    - djm@cvs.openbsd.org 2004/06/25 01:25:12
      [regress/test-exec.sh]
      clean reexec-specific junk out of text-exec.sh and simplify; idea markus@
+   - dtucker@cvs.openbsd.org 2004/06/25 05:38:48
+     [sftp-server.c]
+     Fall back to stat+rename if filesystem doesn't doesn't support hard
+     links.  bz#823, ok djm@
  - (dtucker) [configure.ac openbsd-compat/misc.c [openbsd-compat/misc.h]
    Add closefrom() for platforms that don't have it.
  - (dtucker) [sshd.c] add line missing from reexec sync.
@@ -1419,4 +1423,4 @@
    - (djm) Trim deprecated options from INSTALL. Mention UsePAM
    - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
 
-$Id: ChangeLog,v 1.3449 2004/06/25 04:22:23 dtucker Exp $
+$Id: ChangeLog,v 1.3450 2004/06/25 07:06:02 dtucker Exp $
diff --git a/sftp-server.c b/sftp-server.c
index 8349c1763..39a6bdab4 100644
--- a/sftp-server.c
+++ b/sftp-server.c
@@ -14,7 +14,7 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 #include "includes.h"
-RCSID("$OpenBSD: sftp-server.c,v 1.46 2004/06/21 17:36:31 avsm Exp $");
+RCSID("$OpenBSD: sftp-server.c,v 1.47 2004/06/25 05:38:48 dtucker Exp $");
 
 #include "buffer.h"
 #include "bufaux.h"
@@ -839,9 +839,25 @@ process_rename(void)
 		status = errno_to_portable(errno);
 	else if (S_ISREG(sb.st_mode)) {
 		/* Race-free rename of regular files */
-		if (link(oldpath, newpath) == -1)
-			status = errno_to_portable(errno);
-		else if (unlink(oldpath) == -1) {
+		if (link(oldpath, newpath) == -1) {
+			if (errno == EOPNOTSUPP) {
+				struct stat st;
+
+				/*
+				 * fs doesn't support links, so fall back to
+				 * stat+rename.  This is racy.
+				 */
+				if (stat(newpath, &st) == -1) {
+					if (rename(oldpath, newpath) == -1)
+						status =
+						    errno_to_portable(errno);
+					else
+						status = SSH2_FX_OK;
+				}
+			} else {
+				status = errno_to_portable(errno);
+			}
+		} else if (unlink(oldpath) == -1) {
 			status = errno_to_portable(errno);
 			/* clean spare link */
 			unlink(newpath);
-- 
cgit v1.2.3


From e59b50879819db3bbb189ba7e069950a8991ea05 Mon Sep 17 00:00:00 2001
From: Darren Tucker <dtucker@zip.com.au>
Date: Mon, 28 Jun 2004 16:01:19 +1000
Subject:  - (dtucker) [acconfig.h configure.ac sftp-server.c] Bug #823: add
 sftp    rename handling for Linux which returns EPERM for link() on (at least
 some)    filesystems that do not support hard links.  sftp-server will fall
 back to    stat+rename() in such cases.

---
 ChangeLog     | 6 +++++-
 acconfig.h    | 8 +++++++-
 configure.ac  | 3 ++-
 sftp-server.c | 6 +++++-
 4 files changed, 19 insertions(+), 4 deletions(-)

(limited to 'sftp-server.c')

diff --git a/ChangeLog b/ChangeLog
index e17a57595..ac1145056 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,10 @@
  - (tim) update README files.
  - (dtucker) [mdoc2man.awk] Bug #883: correctly recognise .Pa and .Ev macros.
  - (dtucker) [regress/README.regress] Document new variables.
+ - (dtucker) [acconfig.h configure.ac sftp-server.c] Bug #823: add sftp
+   rename handling for Linux which returns EPERM for link() on (at least some)
+   filesystems that do not support hard links.  sftp-server will fall back to
+   stat+rename() in such cases.
 
 20040626
  - (djm) OpenBSD CVS Sync
@@ -1438,4 +1442,4 @@
    - (djm) Trim deprecated options from INSTALL. Mention UsePAM
    - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
 
-$Id: ChangeLog,v 1.3455 2004/06/28 05:52:50 dtucker Exp $
+$Id: ChangeLog,v 1.3456 2004/06/28 06:01:19 dtucker Exp $
diff --git a/acconfig.h b/acconfig.h
index f14353519..4c655823f 100644
--- a/acconfig.h
+++ b/acconfig.h
@@ -1,4 +1,4 @@
-/* $Id: acconfig.h,v 1.177 2004/04/15 23:22:40 dtucker Exp $ */
+/* $Id: acconfig.h,v 1.178 2004/06/28 06:01:20 dtucker Exp $ */
 
 /*
  * Copyright (c) 1999-2003 Damien Miller.  All rights reserved.
@@ -434,6 +434,12 @@
 /* Define if cmsg_type is not passed correctly */
 #undef BROKEN_CMSG_TYPE
 
+/*
+ * Define to whatever link() returns for "not supported" if it doesn't
+ * return EOPNOTSUPP.
+ */
+#undef LINK_OPNOTSUPP_ERRNO
+
 /* Strings used in /etc/passwd to denote locked account */
 #undef LOCKED_PASSWD_STRING
 #undef LOCKED_PASSWD_PREFIX
diff --git a/configure.ac b/configure.ac
index 1bf3ca66f..3f27bf9a7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-# $Id: configure.ac,v 1.222 2004/06/25 04:03:34 dtucker Exp $
+# $Id: configure.ac,v 1.223 2004/06/28 06:01:20 dtucker Exp $
 #
 # Copyright (c) 1999-2004 Damien Miller
 #
@@ -254,6 +254,7 @@ main() { if (NSVersionOfRunTimeLibrary("System") >= (60 << 16))
 	AC_DEFINE(PAM_TTY_KLUDGE)
 	AC_DEFINE(LOCKED_PASSWD_PREFIX, "!")
 	AC_DEFINE(SPT_TYPE,SPT_REUSEARGV)
+	AC_DEFINE(LINK_OPNOTSUPP_ERRNO, EPERM)
 	inet6_default_4in6=yes
 	case `uname -r` in
 	1.*|2.0.*)
diff --git a/sftp-server.c b/sftp-server.c
index 39a6bdab4..1ff4750ea 100644
--- a/sftp-server.c
+++ b/sftp-server.c
@@ -840,7 +840,11 @@ 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
+#ifdef LINK_OPNOTSUPP_ERRNO
+			    || errno == LINK_OPNOTSUPP_ERRNO
+#endif
+			    ) {
 				struct stat st;
 
 				/*
-- 
cgit v1.2.3


From ba6de952a00558e6d93b8c9edd81806a99716411 Mon Sep 17 00:00:00 2001
From: Darren Tucker <dtucker@zip.com.au>
Date: Sat, 17 Jul 2004 14:07:42 +1000
Subject:  - (dtucker) [logintest.c scp.c sftp-server.c sftp.c ssh-add.c
 ssh-agent.c    ssh-keygen.c ssh-keyscan.c ssh-keysign.c ssh-rand-helper.c
 ssh.c sshd.c    openbsd-compat/bsd-misc.c] Move "char *__progname" to
 bsd-misc.c.  Reduces    diff vs OpenBSD; ok mouring@, tested by tim@ too.

---
 ChangeLog                 | 8 +++++++-
 logintest.c               | 6 +-----
 openbsd-compat/bsd-misc.c | 6 +++++-
 scp.c                     | 4 ----
 sftp-server.c             | 4 ----
 sftp.c                    | 4 ----
 ssh-add.c                 | 6 ------
 ssh-agent.c               | 4 ----
 ssh-keygen.c              | 4 ----
 ssh-keyscan.c             | 4 ----
 ssh-keysign.c             | 4 ----
 ssh-rand-helper.c         | 6 +-----
 ssh.c                     | 4 ----
 sshd.c                    | 4 ----
 14 files changed, 14 insertions(+), 54 deletions(-)

(limited to 'sftp-server.c')

diff --git a/ChangeLog b/ChangeLog
index f6447bb86..a36c1dd22 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+20040717
+ - (dtucker) [logintest.c scp.c sftp-server.c sftp.c ssh-add.c ssh-agent.c
+   ssh-keygen.c ssh-keyscan.c ssh-keysign.c ssh-rand-helper.c ssh.c sshd.c
+   openbsd-compat/bsd-misc.c] Move "char *__progname" to bsd-misc.c.  Reduces
+   diff vs OpenBSD; ok mouring@, tested by tim@ too.
+
 20040711
  - (dtucker) [auth-pam.c] Check for zero from waitpid() too, which allows
    the monitor to properly clean up the PAM thread (Debian bug #252676).
@@ -1503,4 +1509,4 @@
    - (djm) Trim deprecated options from INSTALL. Mention UsePAM
    - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
 
-$Id: ChangeLog,v 1.3473 2004/07/11 06:54:08 dtucker Exp $
+$Id: ChangeLog,v 1.3474 2004/07/17 04:07:42 dtucker Exp $
diff --git a/logintest.c b/logintest.c
index 3f3997d10..95cce5a3a 100644
--- a/logintest.c
+++ b/logintest.c
@@ -43,13 +43,9 @@
 
 #include "loginrec.h"
 
-RCSID("$Id: logintest.c,v 1.10 2003/08/21 23:34:41 djm Exp $");
+RCSID("$Id: logintest.c,v 1.11 2004/07/17 04:07:42 dtucker Exp $");
 
-#ifdef HAVE___PROGNAME
 extern char *__progname;
-#else
-char *__progname;
-#endif
 
 #define PAUSE_BEFORE_LOGOUT 3
 
diff --git a/openbsd-compat/bsd-misc.c b/openbsd-compat/bsd-misc.c
index c58cce0f4..07b7c0755 100644
--- a/openbsd-compat/bsd-misc.c
+++ b/openbsd-compat/bsd-misc.c
@@ -17,7 +17,11 @@
 #include "includes.h"
 #include "xmalloc.h"
 
-RCSID("$Id: bsd-misc.c,v 1.22 2004/06/25 04:03:34 dtucker Exp $");
+RCSID("$Id: bsd-misc.c,v 1.23 2004/07/17 04:07:42 dtucker Exp $");
+
+#ifndef HAVE__PROGNAME
+char *__progname;
+#endif
 
 /*
  * NB. duplicate __progname in case it is an alias for argv[0]
diff --git a/scp.c b/scp.c
index e559122a1..33c5891f2 100644
--- a/scp.c
+++ b/scp.c
@@ -80,11 +80,7 @@ RCSID("$OpenBSD: scp.c,v 1.116 2004/07/08 12:47:21 dtucker Exp $");
 #include "misc.h"
 #include "progressmeter.h"
 
-#ifdef HAVE___PROGNAME
 extern char *__progname;
-#else
-char *__progname;
-#endif
 
 void bwlimit(int);
 
diff --git a/sftp-server.c b/sftp-server.c
index 1ff4750ea..e82280057 100644
--- a/sftp-server.c
+++ b/sftp-server.c
@@ -31,11 +31,7 @@ RCSID("$OpenBSD: sftp-server.c,v 1.47 2004/06/25 05:38:48 dtucker Exp $");
 #define get_string(lenp)		buffer_get_string(&iqueue, lenp);
 #define TRACE				debug
 
-#ifdef HAVE___PROGNAME
 extern char *__progname;
-#else
-char *__progname;
-#endif
 
 /* input and output queue */
 Buffer iqueue;
diff --git a/sftp.c b/sftp.c
index 1bc91a16e..4002304ec 100644
--- a/sftp.c
+++ b/sftp.c
@@ -55,11 +55,7 @@ int sort_flag;
 int remote_glob(struct sftp_conn *, const char *, int,
     int (*)(const char *, int), glob_t *); /* proto for sftp-glob.c */
 
-#ifdef HAVE___PROGNAME
 extern char *__progname;
-#else
-char *__progname;
-#endif
 
 /* Separators for interactive commands */
 #define WHITESPACE " \t\r\n"
diff --git a/ssh-add.c b/ssh-add.c
index 709a36bc1..06a52464e 100644
--- a/ssh-add.c
+++ b/ssh-add.c
@@ -49,12 +49,6 @@ RCSID("$OpenBSD: ssh-add.c,v 1.70 2004/05/08 00:21:31 djm Exp $");
 #include "pathnames.h"
 #include "misc.h"
 
-#ifdef HAVE___PROGNAME
-extern char *__progname;
-#else
-char *__progname;
-#endif
-
 /* argv0 */
 extern char *__progname;
 
diff --git a/ssh-agent.c b/ssh-agent.c
index ea84f2196..54ab4d7a2 100644
--- a/ssh-agent.c
+++ b/ssh-agent.c
@@ -106,11 +106,7 @@ char socket_dir[1024];
 int locked = 0;
 char *lock_passwd = NULL;
 
-#ifdef HAVE___PROGNAME
 extern char *__progname;
-#else
-char *__progname;
-#endif
 
 /* Default lifetime (0 == forever) */
 static int lifetime = 0;
diff --git a/ssh-keygen.c b/ssh-keygen.c
index d4d19d3a1..e8e579b5d 100644
--- a/ssh-keygen.c
+++ b/ssh-keygen.c
@@ -76,11 +76,7 @@ int print_generic = 0;
 char *key_type_name = NULL;
 
 /* argv0 */
-#ifdef HAVE___PROGNAME
 extern char *__progname;
-#else
-char *__progname;
-#endif
 
 char hostname[MAXHOSTNAMELEN];
 
diff --git a/ssh-keyscan.c b/ssh-keyscan.c
index 01615b5c3..fd3185adf 100644
--- a/ssh-keyscan.c
+++ b/ssh-keyscan.c
@@ -49,11 +49,7 @@ int timeout = 5;
 int maxfd;
 #define MAXCON (maxfd - 10)
 
-#ifdef HAVE___PROGNAME
 extern char *__progname;
-#else
-char *__progname;
-#endif
 fd_set *read_wait;
 size_t read_wait_size;
 int ncon;
diff --git a/ssh-keysign.c b/ssh-keysign.c
index e642948a0..cf8b0c2d2 100644
--- a/ssh-keysign.c
+++ b/ssh-keysign.c
@@ -45,11 +45,7 @@ RCSID("$OpenBSD: ssh-keysign.c,v 1.16 2004/04/18 23:10:26 djm Exp $");
 /* XXX readconf.c needs these */
 uid_t original_real_uid;
 
-#ifdef HAVE___PROGNAME
 extern char *__progname;
-#else
-char *__progname;
-#endif
 
 static int
 valid_request(struct passwd *pw, char *host, Key **ret, u_char *data,
diff --git a/ssh-rand-helper.c b/ssh-rand-helper.c
index 471e7295b..86af3893d 100644
--- a/ssh-rand-helper.c
+++ b/ssh-rand-helper.c
@@ -39,7 +39,7 @@
 #include "pathnames.h"
 #include "log.h"
 
-RCSID("$Id: ssh-rand-helper.c,v 1.17 2004/06/15 00:34:08 djm Exp $");
+RCSID("$Id: ssh-rand-helper.c,v 1.18 2004/07/17 04:07:42 dtucker Exp $");
 
 /* Number of bytes we write out */
 #define OUTPUT_SEED_SIZE	48
@@ -63,11 +63,7 @@ RCSID("$Id: ssh-rand-helper.c,v 1.17 2004/06/15 00:34:08 djm Exp $");
 # define SSH_PRNG_COMMAND_FILE   SSHDIR "/ssh_prng_cmds"
 #endif
 
-#ifdef HAVE___PROGNAME
 extern char *__progname;
-#else
-char *__progname;
-#endif
 
 #define WHITESPACE " \t\n"
 
diff --git a/ssh.c b/ssh.c
index 767d99ca9..f0c284df0 100644
--- a/ssh.c
+++ b/ssh.c
@@ -76,11 +76,7 @@ RCSID("$OpenBSD: ssh.c,v 1.222 2004/06/23 14:31:01 dtucker Exp $");
 #include "scard.h"
 #endif
 
-#ifdef HAVE___PROGNAME
 extern char *__progname;
-#else
-char *__progname;
-#endif
 
 /* Flag indicating whether debug mode is on.  This can be set on the command line. */
 int debug_flag = 0;
diff --git a/sshd.c b/sshd.c
index 101419bed..6df8f252a 100644
--- a/sshd.c
+++ b/sshd.c
@@ -103,11 +103,7 @@ int deny_severity = LOG_WARNING;
 #define REEXEC_CONFIG_PASS_FD		(STDERR_FILENO + 3)
 #define REEXEC_MIN_FREE_FD		(STDERR_FILENO + 4)
 
-#ifdef HAVE___PROGNAME
 extern char *__progname;
-#else
-char *__progname;
-#endif
 
 /* Server configuration options. */
 ServerOptions options;
-- 
cgit v1.2.3