diff options
author | phk <phk@FreeBSD.org> | 1995-04-20 05:38:58 +0000 |
---|---|---|
committer | phk <phk@FreeBSD.org> | 1995-04-20 05:38:58 +0000 |
commit | 92bb6593c4334176cff4432f6dd283dad8e19515 (patch) | |
tree | 26937eb23506d469004355aa636d5b18250c2645 /usr.bin | |
parent | f8bb0b05f3896a2009249af4e57db64f6dfa3b66 (diff) | |
download | FreeBSD-src-92bb6593c4334176cff4432f6dd283dad8e19515.zip FreeBSD-src-92bb6593c4334176cff4432f6dd283dad8e19515.tar.gz |
Use port 21 as default if getservbyname fails to find it for us. This let
us remove some crud from the install-procedure.
Diffstat (limited to 'usr.bin')
-rw-r--r-- | usr.bin/ftp/main.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/usr.bin/ftp/main.c b/usr.bin/ftp/main.c index 7f2165d..98bc4d1 100644 --- a/usr.bin/ftp/main.c +++ b/usr.bin/ftp/main.c @@ -70,10 +70,14 @@ main(argc, argv) int ch, top; struct passwd *pw = NULL; char *cp, homedir[MAXPATHLEN]; + struct servent sp_default; sp = getservbyname("ftp", "tcp"); - if (sp == 0) - errx(1, "ftp/tcp: unknown service"); + if (sp == 0) { + sp = &sp_default; + memset(sp, 0, sizeof *sp); + sp->s_port = htons(21); + } doglob = 1; interactive = 1; autologin = 1; |