summaryrefslogtreecommitdiff
path: root/ftp/wu-ftpd+ipv6/files/patch-aa
diff options
context:
space:
mode:
authorTorsten Blum <torstenb@FreeBSD.org>1994-10-23 01:37:00 +0000
committerTorsten Blum <torstenb@FreeBSD.org>1994-10-23 01:37:00 +0000
commit33991ff4fa1da4fde8f710657a06885dbaebab60 (patch)
tree33cbdeabca999a66558057793cd1836150135717 /ftp/wu-ftpd+ipv6/files/patch-aa
parentReviewed by: (diff)
Reviewed by:
Submitted by: Obtained from: wuarchive ftpd with skey support
Notes
Notes: svn path=/head/; revision=270
Diffstat (limited to 'ftp/wu-ftpd+ipv6/files/patch-aa')
-rw-r--r--ftp/wu-ftpd+ipv6/files/patch-aa93
1 files changed, 93 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