diff --git a/copyparty/__main__.py b/copyparty/__main__.py index 7fdb81ec..6f7dba86 100644 --- a/copyparty/__main__.py +++ b/copyparty/__main__.py @@ -1521,6 +1521,7 @@ def add_ftp(ap): ap2.add_argument("--ftp-wt", metavar="SEC", type=int, default=7, help="grace period for resuming interrupted uploads (any client can write to any file last-modified more recently than \033[33mSEC\033[0m seconds ago)") ap2.add_argument("--ftp-nat", metavar="ADDR", type=u, default="", help="the NAT address to use for passive connections") ap2.add_argument("--ftp-pr", metavar="P-P", type=u, default="", help="the range of TCP ports to use for passive connections, for example \033[32m12000-13000") + ap2.add_argument("--ftp-banner", metavar="BANNER", type=u, default="copyparty ftpd", help="banner to send before ftp login") def add_webdav(ap): diff --git a/copyparty/ftpd.py b/copyparty/ftpd.py index ccbd423c..f6a7b2f1 100644 --- a/copyparty/ftpd.py +++ b/copyparty/ftpd.py @@ -629,7 +629,7 @@ class Ftpd(object): FtpHandler.hub = h2.hub = hub FtpHandler.args = h2.args = hub.args FtpHandler.authorizer = h2.authorizer = FtpAuth(hub) - + FtpHandler.banner = self.args.ftp_banner.replace("\\n", "\r\n") if self.args.ftp_pr: p1, p2 = [int(x) for x in self.args.ftp_pr.split("-")] if self.args.ftp and self.args.ftps: