Reviewed by:

Submitted by:	
Obtained from:
wuarchive ftpd with skey support

3 files changed, 196 insertions, 0 deletions

diff --git a/ftp/wu-ftpd+ipv6/files/patch-aa b/ftp/wu-ftpd+ipv6/files/patch-aa
new file mode 100644
index 000000000000..5c2afd84d3db
--- /dev/null
+++ b/ftp/wu-ftpd+ipv6/files/patch-aa
@@ -0,0 +1,93 @@
+diff -c -r src/ftpd.c.orig src/ftpd.c
+*** src/ftpd.c.orig	Wed Apr 13 23:17:18 1994
+--- src/ftpd.c	Tue Oct 18 18:04:43 1994
+***************
+*** 139,146 ****
+   *freopen(const char *, const char *, FILE *);
+  extern int ftpd_pclose(FILE *iop),
+    fclose(FILE *);
+! extern char *getline(),
+!  *realpath(char *pathname, char *result);
+  extern char cbuf[];
+  extern off_t restart_point;
+  
+--- 139,148 ----
+   *freopen(const char *, const char *, FILE *);
+  extern int ftpd_pclose(FILE *iop),
+    fclose(FILE *);
+! extern char *getline();
+! #ifndef HAVE_REALPATH
+! extern char *realpath(char *pathname, char *result);
+! #endif
+  extern char cbuf[];
+  extern off_t restart_point;
+  
+***************
+*** 237,242 ****
+--- 239,250 ----
+  
+  #endif /* SETPROCTITLE */
+  
++ #ifdef SKEY
++ int	pwok = 0;
++ char	*skey_challenge();
++ char	*skey_crypt();
++ #endif
++ 
+  #ifdef KERBEROS
+  void init_krb();
+  void end_krb();
+***************
+*** 878,884 ****
+--- 886,897 ----
+      } else
+          acl_setfunctions();
+  
++ #ifdef SKEY
++     pwok = skeyaccess(name, NULL, remotehost);
++     reply(331, "%s", skey_challenge(name, pw, pwok));
++ #else
+      reply(331, "Password required for %s.", name);
++ #endif
+      askpasswd = 1;
+      /* Delay before reading passwd after first failed attempt to slow down
+       * passwd-guessing programs. */
+***************
+*** 1007,1013 ****
+--- 1020,1031 ----
+  #ifdef KERBEROS
+          xpasswd = crypt16(passwd, salt);
+  #else
++ #ifdef SKEY
++ 	xpasswd = skey_crypt(passwd, salt, pw, pwok);
++ 	pwok = 0;
++ #else
+          xpasswd = crypt(passwd, salt);
++ #endif
+  #endif
+  
+  #ifdef ULTRIX_AUTH
+diff -c -r src/realpath.c.orig src/realpath.c
+*** src/realpath.c.orig	Fri Apr  1 21:03:45 1994
+--- src/realpath.c	Tue Oct 18 17:48:34 1994
+***************
+*** 29,36 ****
+--- 29,39 ----
+   * POSSIBILITY OF SUCH DAMAGE.
+   */
+  
++ 
+  #include "config.h"
+  
++ #ifndef HAVE_REALPATH
++ 
+  #include <stdio.h>
+  #include <sys/types.h>
+  #include <sys/stat.h>
+***************
+*** 159,161 ****
+--- 162,165 ----
+      strcpy(result, workpath);
+      return (result);
+  }
++ #endif
diff --git a/ftp/wu-ftpd+ipv6/files/patch-ab b/ftp/wu-ftpd+ipv6/files/patch-ab
new file mode 100644
index 000000000000..26023cbbe70c
--- /dev/null
+++ b/ftp/wu-ftpd+ipv6/files/patch-ab
@@ -0,0 +1,56 @@
+*** Makefile.orig	Fri Apr  1 21:03:58 1994
+--- Makefile	Tue Oct 18 18:45:08 1994
+***************
+*** 1,25 ****
+! BINDIR=		/usr/local/bin
+! ETCDIR=		/usr/local/etc
+! MANDIR=		/usr/local/man
+  MANEXT=		8
+  
+  all:
+  	@ echo 'Use the "build" command (shell script) to make ftpd.'
+  	@ echo 'You can say "build help" for details on how it works.'
+  
+  install: bin/ftpd bin/ftpcount bin/ftpshut
+  	-mv -f ${ETCDIR}/ftpd ${ETCDIR}/ftpd-old
+  	@echo Installing binaries.
+! 	install -o bin -g bin -m 755 bin/ftpd ${ETCDIR}/ftpd
+! 	install -o bin -g bin -m 755 bin/ftpshut ${BINDIR}/ftpshut
+! 	install -o bin -g bin -m 755 bin/ftpcount ${BINDIR}/ftpcount
+! 	install -o bin -g bin -m 755 bin/ftpwho ${BINDIR}/ftpwho
+  	@echo Installing manpages.
+! 	install -o bin -g bin -m 755 doc/ftpd.8 ${MANDIR}/man8/ftpd.8
+! 	install -o bin -g bin -m 755 doc/ftpcount.1 ${MANDIR}/man1/ftpcount.1
+! 	install -o bin -g bin -m 755 doc/ftpwho.1 ${MANDIR}/man1/ftpwho.1
+! 	install -o bin -g bin -m 755 doc/ftpshut.8 ${MANDIR}/man8/ftpshut.8
+! 	install -o bin -g bin -m 755 doc/ftpaccess.5 ${MANDIR}/man5/ftpaccess.5
+! 	install -o bin -g bin -m 755 doc/ftphosts.5 ${MANDIR}/man5/ftphosts.5
+! 	install -o bin -g bin -m 755 doc/ftpconversions.5 ${MANDIR}/man5/ftpconversions.5
+! 	install -o bin -g bin -m 755 doc/xferlog.5 ${MANDIR}/man5/xferlog.5
+--- 1,26 ----
+! BINDIR=		${PREFIX}/bin
+! ETCDIR=		${PREFIX}/etc
+! MANDIR=		${PREFIX}/man
+  MANEXT=		8
+  
+  all:
++ 	/bin/sh build fb2
+  	@ echo 'Use the "build" command (shell script) to make ftpd.'
+  	@ echo 'You can say "build help" for details on how it works.'
+  
+  install: bin/ftpd bin/ftpcount bin/ftpshut
+  	-mv -f ${ETCDIR}/ftpd ${ETCDIR}/ftpd-old
+  	@echo Installing binaries.
+! 	install -c -o bin -g bin -m 755 bin/ftpd ${ETCDIR}/ftpd
+! 	install -c -o bin -g bin -m 755 bin/ftpshut ${BINDIR}/ftpshut
+! 	install -c -o bin -g bin -m 755 bin/ftpcount ${BINDIR}/ftpcount
+! 	install -c -o bin -g bin -m 755 bin/ftpwho ${BINDIR}/ftpwho
+  	@echo Installing manpages.
+! 	install -c -o bin -g bin -m 755 doc/ftpd.8 ${MANDIR}/man8/ftpd.8
+! 	install -c -o bin -g bin -m 755 doc/ftpcount.1 ${MANDIR}/man1/ftpcount.1
+! 	install -c -o bin -g bin -m 755 doc/ftpwho.1 ${MANDIR}/man1/ftpwho.1
+! 	install -c -o bin -g bin -m 755 doc/ftpshut.8 ${MANDIR}/man8/ftpshut.8
+! 	install -c -o bin -g bin -m 755 doc/ftpaccess.5 ${MANDIR}/man5/ftpaccess.5
+! 	install -c -o bin -g bin -m 755 doc/ftphosts.5 ${MANDIR}/man5/ftphosts.5
+! 	install -c -o bin -g bin -m 755 doc/ftpconversions.5 ${MANDIR}/man5/ftpconversions.5
+! 	install -c -o bin -g bin -m 755 doc/xferlog.5 ${MANDIR}/man5/xferlog.5
diff --git a/ftp/wu-ftpd+ipv6/files/patch-ac b/ftp/wu-ftpd+ipv6/files/patch-ac
new file mode 100644
index 000000000000..8f9f98a46283
--- /dev/null
+++ b/ftp/wu-ftpd+ipv6/files/patch-ac
@@ -0,0 +1,47 @@
+*** src/pathnames.h.orig	Wed Apr 13 22:46:48 1994
+--- src/pathnames.h	Tue Oct 18 18:26:26 1994
+***************
+*** 29,41 ****
+   *
+   * @(#)pathnames.h 5.2 (Berkeley) 6/1/90 */
+  
+! #define _PATH_FTPUSERS  "/etc/ftpusers"
+! #define _PATH_FTPACCESS "/usr/local/etc/ftpaccess"
+  #define _PATH_EXECPATH  "/bin/ftp-exec"
+! #define _PATH_PIDNAMES  "/usr/local/daemon/ftpd/ftp.pids-%s"
+! #define _PATH_CVT       "/usr/local/etc/ftpconversions"
+! #define _PATH_XFERLOG   "/usr/adm/xferlog"
+! #define _PATH_PRIVATE   "/etc/ftpgroups"
+  
+  #ifndef _PATH_UTMP
+  #define _PATH_UTMP      "/etc/utmp"
+--- 29,41 ----
+   *
+   * @(#)pathnames.h 5.2 (Berkeley) 6/1/90 */
+  
+! #define _PATH_FTPUSERS  "!!PREFIX!!/etc/ftpusers"
+! #define _PATH_FTPACCESS "!!PREFIX!!/etc/ftpaccess"
+  #define _PATH_EXECPATH  "/bin/ftp-exec"
+! #define _PATH_PIDNAMES  "!!PREFIX!!/daemon/ftpd/ftp.pids-%s"
+! #define _PATH_CVT       "!!PREFIX!!/etc/ftpconversions"
+! #define _PATH_XFERLOG   "/var/log/xferlog"
+! #define _PATH_PRIVATE   "!!PREFIX!!/etc/ftpgroups"
+  
+  #ifndef _PATH_UTMP
+  #define _PATH_UTMP      "/etc/utmp"
+***************
+*** 47,52 ****
+  #define _PATH_DEVNULL   "/dev/null"
+  
+  #ifdef  HOST_ACCESS
+! #define _PATH_FTPHOSTS  "/usr/local/etc/ftphosts"
+  #endif
+  
+--- 47,53 ----
+  #define _PATH_DEVNULL   "/dev/null"
+  
+  #ifdef  HOST_ACCESS
+! #define _PATH_FTPHOSTS  "!!PREFIX!!/etc/ftphosts"
+! #else
+  #endif
+