===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ftp/cmds.c,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- src/usr.bin/ftp/cmds.c	2012/10/15 21:20:05	1.71
+++ src/usr.bin/ftp/cmds.c	2014/08/16 07:49:27	1.72
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cmds.c,v 1.71 2012/10/15 21:20:05 bluhm Exp $	*/
+/*	$OpenBSD: cmds.c,v 1.72 2014/08/16 07:49:27 deraadt Exp $	*/
 /*	$NetBSD: cmds.c,v 1.27 1997/08/18 10:20:15 lukem Exp $	*/
 
 /*
@@ -79,6 +79,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
+#include <errno.h>
 
 #include "ftp_var.h"
 #include "pathnames.h"
@@ -1326,6 +1327,7 @@
 void
 proxabort(int signo)
 {
+	int save_errno = errno;
 
 	alarmtimer(0);
 	if (!proxy) {
@@ -1338,6 +1340,7 @@
 		proxflag = 0;
 	}
 	pswitch(0);
+	errno = save_errno;
 	longjmp(abortprox, 1);
 }