From 2a9d8c7d6f30e4815c3107997b5e27a7f7ae1b34 Mon Sep 17 00:00:00 2001
From: ache <ache@FreeBSD.org>
Date: Fri, 15 May 1998 16:30:09 +0000
Subject: Use fork instead of vfork since setenv clobber parent environment
 Fork already used for INTERNAL_LS in anycase

---
 libexec/ftpd/popen.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/libexec/ftpd/popen.c b/libexec/ftpd/popen.c
index d8b91cd..e7e4fbf 100644
--- a/libexec/ftpd/popen.c
+++ b/libexec/ftpd/popen.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)popen.c	8.3 (Berkeley) 4/6/94";
 #endif
 static const char rcsid[] =
-	"$Id: popen.c,v 1.11 1998/04/27 10:51:26 dg Exp $";
+	"$Id: popen.c,v 1.12 1998/05/15 16:08:52 ache Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
@@ -120,10 +120,8 @@ ftpd_popen(program, type)
 	iop = NULL;
 #ifdef	INTERNAL_LS
 	fflush(NULL);
-	pid = (strcmp(gargv[0], _PATH_LS) == 0) ? fork() : vfork();
-#else
-	pid = vfork();
 #endif
+	pid = fork();
 	switch(pid) {
 	case -1:			/* error */
 		(void)close(pdes[0]);
-- 
cgit v1.1