1 diff -bruN ftpd-BSD-0.3.2/ftpd/ftpd.8 ftpd-BSD-0.3.2.new/ftpd/ftpd.8
2 --- ftpd-BSD-0.3.2/ftpd/ftpd.8 Thu Jul 6 18:24:17 2000
3 +++ ftpd-BSD-0.3.2.new/ftpd/ftpd.8 Wed Aug 16 13:17:26 2000
5 and requires it use the same source address as the connection came from.
6 This prevents the "FTP bounce attack" against services on both the local
7 machine and other local machines.
11 +from displaying program name and version at the connection startup.
17 making them visible to commands such as
24 +user, instead of default
27 .It Fl T Ar maxtimeout
28 A client may also request a different timeout period;
29 the maximum period allowed may be set to
30 diff -bruN ftpd-BSD-0.3.2/ftpd/ftpd.c ftpd-BSD-0.3.2.new/ftpd/ftpd.c
31 --- ftpd-BSD-0.3.2/ftpd/ftpd.c Fri Jul 7 05:06:04 2000
32 +++ ftpd-BSD-0.3.2.new/ftpd/ftpd.c Wed Aug 16 13:46:09 2000
35 #if !defined(CMASK) || CMASK == 0
40 int defumask = CMASK; /* default umask value */
41 int umaskchange = 1; /* allow user to change umask value. */
44 #endif /* not ORIGINAL_SOURCE */
46 +#ifndef ORIGINAL_SOURCE
47 +char *anon_ftp_user = "ftp";
53 #ifdef ORIGINAL_SOURCE
54 char *argstr = "AdDhlMSt:T:u:UvP46";
56 -char *argstr = "AdDhlMqSt:T:u:UvP46";
57 +char *argstr = "AdDhlMqSt:T:u:UvP46z:";
58 #endif /* not ORIGINAL_SOURCE */
65 +#ifndef ORIGINAL_SOURCE
67 + anon_ftp_user = strdup(optarg);
75 if (checkuser(_PATH_FTPUSERS, "ftp") ||
76 checkuser(_PATH_FTPUSERS, "anonymous"))
77 reply(530, "User %s access denied.", name);
78 +#ifdef ORIGINAL_SOURCE
79 else if ((pw = sgetpwnam("ftp")) != NULL) {
81 + else if ((pw = sgetpwnam(anon_ftp_user)) != NULL) {