From e7458ed790589eae9dbbd7260697ee761816ec9a Mon Sep 17 00:00:00 2001
From: Torsten Blum <torstenb@FreeBSD.org>
Date: Sun, 18 Dec 1994 00:52:55 +0000
Subject: change _PATH_PIDNAME to "/var/run/ftp.pids-%s"

---
 ftp/wu-ftpd+ipv6/files/patch-aa | 27 +++++++++++++++++++++------
 ftp/wu-ftpd+ipv6/files/patch-ac |  2 +-
 ftp/wu-ftpd/files/patch-aa      | 27 +++++++++++++++++++++------
 ftp/wu-ftpd/files/patch-ac      |  2 +-
 4 files changed, 44 insertions(+), 14 deletions(-)

(limited to 'ftp')

diff --git a/ftp/wu-ftpd+ipv6/files/patch-aa b/ftp/wu-ftpd+ipv6/files/patch-aa
index 5c2afd84d3db..24b57b2de9bd 100644
--- a/ftp/wu-ftpd+ipv6/files/patch-aa
+++ b/ftp/wu-ftpd+ipv6/files/patch-aa
@@ -1,6 +1,5 @@
-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
+--- src/ftpd.c	Sat Dec 17 23:48:25 1994
 ***************
 *** 139,146 ****
    *freopen(const char *, const char *, FILE *);
@@ -24,27 +23,43 @@ diff -c -r src/ftpd.c.orig src/ftpd.c
   
 ***************
 *** 237,242 ****
---- 239,250 ----
+--- 239,254 ----
   
   #endif /* SETPROCTITLE */
   
 + #ifdef SKEY
++ #include <skey.h>
 + int	pwok = 0;
++ char	addr_string[20];
++ /*
 + char	*skey_challenge();
 + char	*skey_crypt();
++ */
 + #endif
 + 
   #ifdef KERBEROS
   void init_krb();
   void end_krb();
 ***************
+*** 279,284 ****
+--- 291,299 ----
+          exit(1);
+  #endif
+      }
++ #ifdef SKEY
++     strcpy(addr_string, inet_ntoa(his_addr.sin_addr));
++ #endif
+      addrlen = sizeof(ctrl_addr);
+      if (getsockname(0, (struct sockaddr *) &ctrl_addr, &addrlen) < 0) {
+          syslog(LOG_ERR, "getsockname (%s): %m", argv[0]);
+***************
 *** 878,884 ****
---- 886,897 ----
+--- 893,904 ----
       } else
           acl_setfunctions();
   
 + #ifdef SKEY
-+     pwok = skeyaccess(name, NULL, remotehost);
++     pwok = skeyaccess(name, NULL, remotehost, addr_string);
 +     reply(331, "%s", skey_challenge(name, pw, pwok));
 + #else
       reply(331, "Password required for %s.", name);
@@ -54,7 +69,7 @@ diff -c -r src/ftpd.c.orig src/ftpd.c
        * passwd-guessing programs. */
 ***************
 *** 1007,1013 ****
---- 1020,1031 ----
+--- 1027,1038 ----
   #ifdef KERBEROS
           xpasswd = crypt16(passwd, salt);
   #else
diff --git a/ftp/wu-ftpd+ipv6/files/patch-ac b/ftp/wu-ftpd+ipv6/files/patch-ac
index 8f9f98a46283..eb7be9d73a70 100644
--- a/ftp/wu-ftpd+ipv6/files/patch-ac
+++ b/ftp/wu-ftpd+ipv6/files/patch-ac
@@ -22,7 +22,7 @@
 ! #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_PIDNAMES  "/var/run/ftp.pids-%s"
 ! #define _PATH_CVT       "!!PREFIX!!/etc/ftpconversions"
 ! #define _PATH_XFERLOG   "/var/log/xferlog"
 ! #define _PATH_PRIVATE   "!!PREFIX!!/etc/ftpgroups"
diff --git a/ftp/wu-ftpd/files/patch-aa b/ftp/wu-ftpd/files/patch-aa
index 5c2afd84d3db..24b57b2de9bd 100644
--- a/ftp/wu-ftpd/files/patch-aa
+++ b/ftp/wu-ftpd/files/patch-aa
@@ -1,6 +1,5 @@
-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
+--- src/ftpd.c	Sat Dec 17 23:48:25 1994
 ***************
 *** 139,146 ****
    *freopen(const char *, const char *, FILE *);
@@ -24,27 +23,43 @@ diff -c -r src/ftpd.c.orig src/ftpd.c
   
 ***************
 *** 237,242 ****
---- 239,250 ----
+--- 239,254 ----
   
   #endif /* SETPROCTITLE */
   
 + #ifdef SKEY
++ #include <skey.h>
 + int	pwok = 0;
++ char	addr_string[20];
++ /*
 + char	*skey_challenge();
 + char	*skey_crypt();
++ */
 + #endif
 + 
   #ifdef KERBEROS
   void init_krb();
   void end_krb();
 ***************
+*** 279,284 ****
+--- 291,299 ----
+          exit(1);
+  #endif
+      }
++ #ifdef SKEY
++     strcpy(addr_string, inet_ntoa(his_addr.sin_addr));
++ #endif
+      addrlen = sizeof(ctrl_addr);
+      if (getsockname(0, (struct sockaddr *) &ctrl_addr, &addrlen) < 0) {
+          syslog(LOG_ERR, "getsockname (%s): %m", argv[0]);
+***************
 *** 878,884 ****
---- 886,897 ----
+--- 893,904 ----
       } else
           acl_setfunctions();
   
 + #ifdef SKEY
-+     pwok = skeyaccess(name, NULL, remotehost);
++     pwok = skeyaccess(name, NULL, remotehost, addr_string);
 +     reply(331, "%s", skey_challenge(name, pw, pwok));
 + #else
       reply(331, "Password required for %s.", name);
@@ -54,7 +69,7 @@ diff -c -r src/ftpd.c.orig src/ftpd.c
        * passwd-guessing programs. */
 ***************
 *** 1007,1013 ****
---- 1020,1031 ----
+--- 1027,1038 ----
   #ifdef KERBEROS
           xpasswd = crypt16(passwd, salt);
   #else
diff --git a/ftp/wu-ftpd/files/patch-ac b/ftp/wu-ftpd/files/patch-ac
index 8f9f98a46283..eb7be9d73a70 100644
--- a/ftp/wu-ftpd/files/patch-ac
+++ b/ftp/wu-ftpd/files/patch-ac
@@ -22,7 +22,7 @@
 ! #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_PIDNAMES  "/var/run/ftp.pids-%s"
 ! #define _PATH_CVT       "!!PREFIX!!/etc/ftpconversions"
 ! #define _PATH_XFERLOG   "/var/log/xferlog"
 ! #define _PATH_PRIVATE   "!!PREFIX!!/etc/ftpgroups"
-- 
cgit