diff -bruN ftpd-BSD-0.3.2/ftpd/ftpd.c ftpd-BSD-0.3.2.new/ftpd/ftpd.c --- ftpd-BSD-0.3.2/ftpd/ftpd.c Fri Jul 7 05:06:04 2000 +++ ftpd-BSD-0.3.2.new/ftpd/ftpd.c Wed Aug 16 12:54:54 2000 @@ -248,6 +248,9 @@ #endif /* USE_PAM */ #endif /* not ORIGINAL_SOURCE */ +#ifndef ORIGINAL_SOURCE +char *anon_ftp_user = "ftp"; +#endif int epsvall = 0; @@ -336,7 +339,7 @@ #ifdef ORIGINAL_SOURCE char *argstr = "AdDhlMSt:T:u:UvP46"; #else -char *argstr = "AdDhlMqSt:T:u:UvP46"; +char *argstr = "AdDhlMqSt:T:u:UvP46z:"; #endif /* not ORIGINAL_SOURCE */ static void @@ -450,6 +453,12 @@ family = AF_INET6; break; +#ifndef ORIGINAL_SOURCE + case 'z': + anon_ftp_user = strdup(optarg); + break; +#endif + default: usage(); break; @@ -837,7 +846,11 @@ if (checkuser(_PATH_FTPUSERS, "ftp") || checkuser(_PATH_FTPUSERS, "anonymous")) reply(530, "User %s access denied.", name); +#ifdef ORIGINAL_SOURCE else if ((pw = sgetpwnam("ftp")) != NULL) { +#else + else if ((pw = sgetpwnam(anon_ftp_user)) != NULL) { +#endif guest = 1; askpasswd = 1; reply(331,