diff options
author | Tom Yu <tlyu@mit.edu> | 2003-06-05 23:54:15 +0000 |
---|---|---|
committer | Tom Yu <tlyu@mit.edu> | 2003-06-05 23:54:15 +0000 |
commit | 2b8efdcbb7bef45c16822533828400559f8b9c92 (patch) | |
tree | 0a2cefec34c308d9c263b9488c4df5d4b2a39aea /src/appl | |
parent | 79663b2b7562bd614c1f634d9336583281c1754f (diff) | |
download | krb5-2b8efdcbb7bef45c16822533828400559f8b9c92.zip krb5-2b8efdcbb7bef45c16822533828400559f8b9c92.tar.gz krb5-2b8efdcbb7bef45c16822533828400559f8b9c92.tar.bz2 |
pullup from trunk
ticket: 1547
version_fixed: 1.3
git-svn-id: svn://anonsvn.mit.edu/krb5/branches/krb5-1-3@15583 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/appl')
-rw-r--r-- | src/appl/gssftp/ChangeLog | 4 | ||||
-rw-r--r-- | src/appl/gssftp/configure.in | 1 | ||||
-rw-r--r-- | src/appl/gssftp/ftp/ChangeLog | 4 | ||||
-rw-r--r-- | src/appl/gssftp/ftp/pclose.c | 5 | ||||
-rw-r--r-- | src/appl/gssftp/ftpd/ChangeLog | 4 | ||||
-rw-r--r-- | src/appl/gssftp/ftpd/popen.c | 5 |
6 files changed, 14 insertions, 9 deletions
diff --git a/src/appl/gssftp/ChangeLog b/src/appl/gssftp/ChangeLog index 1a0f466..2a6a5fd 100644 --- a/src/appl/gssftp/ChangeLog +++ b/src/appl/gssftp/ChangeLog @@ -1,3 +1,7 @@ +2003-06-05 Sam Hartman <hartmans@mit.edu> + + * configure.in: Don't check for vfork as we no longer use it + 2003-05-23 Ken Raeburn <raeburn@mit.edu> * configure.in: Don't use libkrb524.a any more. diff --git a/src/appl/gssftp/configure.in b/src/appl/gssftp/configure.in index a1fb062..bf6d3b8 100644 --- a/src/appl/gssftp/configure.in +++ b/src/appl/gssftp/configure.in @@ -12,7 +12,6 @@ DECLARE_SYS_ERRLIST AC_CHECK_SIZEOF(short) AC_CHECK_SIZEOF(int) AC_CHECK_SIZEOF(long) -AC_FUNC_VFORK AC_HEADER_STDARG AC_CHECK_HEADER(termios.h,[AC_CHECK_FUNC(cfsetispeed,AC_DEFINE(POSIX_TERMIOS))]) AC_CHECK_HEADERS(unistd.h stdlib.h string.h sys/select.h sys/sockio.h paths.h) diff --git a/src/appl/gssftp/ftp/ChangeLog b/src/appl/gssftp/ftp/ChangeLog index ba67eb5..614948d 100644 --- a/src/appl/gssftp/ftp/ChangeLog +++ b/src/appl/gssftp/ftp/ChangeLog @@ -1,3 +1,7 @@ +2003-06-05 Sam Hartman <hartmans@mit.edu> + + * pclose.c (mypopen): use fork not vfork + 2003-01-09 Ken Raeburn <raeburn@mit.edu> * ftp.c (hookup, initconn, dataconn): Use socklen_t when passing diff --git a/src/appl/gssftp/ftp/pclose.c b/src/appl/gssftp/ftp/pclose.c index 04e481b..5d6a5aa 100644 --- a/src/appl/gssftp/ftp/pclose.c +++ b/src/appl/gssftp/ftp/pclose.c @@ -15,9 +15,6 @@ static char sccsid[] = "@(#)pclose.c 1.1 90/04/28 SMI"; /* from UCB 1.2 3/7/86 * #include <signal.h> #include <sys/param.h> #include <sys/wait.h> -#ifdef HAVE_VFORK_H -#include <vfork.h> -#endif #define sig_t my_sig_t #define sigtype krb5_sigtype typedef sigtype (*sig_t)(); @@ -60,7 +57,7 @@ mypopen(cmd,mode) return (NULL); myside = tst(p[WTR], p[RDR]); hisside = tst(p[RDR], p[WTR]); - if ((pid = vfork()) == 0) { + if ((pid = fork()) == 0) { /* myside and hisside reverse roles in child */ (void) close(myside); if (hisside != tst(0, 1)) { diff --git a/src/appl/gssftp/ftpd/ChangeLog b/src/appl/gssftp/ftpd/ChangeLog index 9b480c5..7381476 100644 --- a/src/appl/gssftp/ftpd/ChangeLog +++ b/src/appl/gssftp/ftpd/ChangeLog @@ -1,3 +1,7 @@ +2003-06-05 Sam Hartman <hartmans@mit.edu> + + * popen.c (ftpd_popen): Use fork not vfork + 2003-04-23 Ken Raeburn <raeburn@mit.edu> * ftpd.c: Don't declare errno. diff --git a/src/appl/gssftp/ftpd/popen.c b/src/appl/gssftp/ftpd/popen.c index 317b6fa..e9e5895 100644 --- a/src/appl/gssftp/ftpd/popen.c +++ b/src/appl/gssftp/ftpd/popen.c @@ -46,9 +46,6 @@ static char sccsid[] = "@(#)popen.c 5.9 (Berkeley) 2/25/91"; #include <stdio.h> #include <stdlib.h> #include <string.h> -#ifdef HAVE_VFORK_H -#include <vfork.h> -#endif #include "ftpd_var.h" /* @@ -109,7 +106,7 @@ ftpd_popen(program, type) gargv[gargc] = NULL; iop = NULL; - switch(pid = vfork()) { + switch(pid = fork()) { case -1: /* error */ (void)close(pdes[0]); (void)close(pdes[1]); |