--- configure.ac~	Tue Sep 16 00:48:15 2003
+++ configure.ac	Wed Sep 17 22:00:46 2003
@@ -122,6 +122,9 @@
 	AC_DEFINE(IP_TOS_IS_BROKEN)
 	;;
 *-*-darwin*)
+       AC_DEFINE(SETEUID_BREAKS_SETUID)
+	AC_DEFINE(BROKEN_SETREUID)
+	AC_DEFINE(BROKEN_SETREGID)
 	AC_MSG_CHECKING(if we have working getaddrinfo)
 	AC_TRY_RUN([#include <mach-o/dyld.h>
 main() { if (NSVersionOfRunTimeLibrary("System") >= (60 << 16))

--- sftp-int.c~	Mon Aug 25 21:12:56 2003
+++ sftp-int.c	Thu Sep 18 16:36:57 2003
@@ -351,6 +351,7 @@
 		for (i = j = 0; i <= strlen(cp); i++) {
 			if (cp[i] == quot) {	/* Found quote */
 				(*path)[j] = '\0';
+				i++;
 				break;
 			}
 			if (cp[i] == '\0') {	/* End of string */