===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/readpass.c,v
retrieving revision 1.33.2.1
retrieving revision 1.34
diff -u -r1.33.2.1 -r1.34
--- src/usr.bin/ssh/readpass.c	2006/10/06 03:19:33	1.33.2.1
+++ src/usr.bin/ssh/readpass.c	2006/02/08 12:15:27	1.34
@@ -1,4 +1,3 @@
-/* $OpenBSD: readpass.c,v 1.33.2.1 2006/10/06 03:19:33 brad Exp $ */
 /*
  * Copyright (c) 2001 Markus Friedl.  All rights reserved.
  *
@@ -23,25 +22,17 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sys/types.h>
-#include <sys/wait.h>
+#include "includes.h"
+RCSID("$OpenBSD: readpass.c,v 1.34 2006/02/08 12:15:27 stevesk Exp $");
 
-#include <errno.h>
-#include <fcntl.h>
 #include <paths.h>
 #include <readpassphrase.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
 
 #include "xmalloc.h"
 #include "misc.h"
 #include "pathnames.h"
 #include "log.h"
 #include "ssh.h"
-#include "uidswap.h"
 
 static char *
 ssh_askpass(char *askpass, const char *msg)
@@ -65,7 +56,8 @@
 		return NULL;
 	}
 	if (pid == 0) {
-		permanently_drop_suid(getuid());
+		seteuid(getuid());
+		setuid(getuid());
 		close(p[0]);
 		if (dup2(p[1], STDOUT_FILENO) < 0)
 			fatal("ssh_askpass: dup2: %s", strerror(errno));