diff options
author | kris <kris@FreeBSD.org> | 2000-07-05 21:54:07 +0000 |
---|---|---|
committer | kris <kris@FreeBSD.org> | 2000-07-05 21:54:07 +0000 |
commit | 13d90d944f154efa9feb5a06266329c85d01f979 (patch) | |
tree | 7fc107473d0c5c157c2ac2603e6628db258d9159 /usr.sbin/faithd/ftp.c | |
parent | 8a5ba0ae5fe6fbf7d2335ae09e1f86c01e466bbf (diff) | |
download | FreeBSD-src-13d90d944f154efa9feb5a06266329c85d01f979.zip FreeBSD-src-13d90d944f154efa9feb5a06266329c85d01f979.tar.gz |
Sync with latest KAME.
Obtained from: KAME
Diffstat (limited to 'usr.sbin/faithd/ftp.c')
-rw-r--r-- | usr.sbin/faithd/ftp.c | 25 |
1 files changed, 11 insertions, 14 deletions
diff --git a/usr.sbin/faithd/ftp.c b/usr.sbin/faithd/ftp.c index b45017a..53f94f1 100644 --- a/usr.sbin/faithd/ftp.c +++ b/usr.sbin/faithd/ftp.c @@ -1,7 +1,9 @@ +/* $KAME$ */ + /* * Copyright (C) 1997 and 1998 WIDE Project. * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -13,7 +15,7 @@ * 3. Neither the name of the project nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. - * + * * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE @@ -405,7 +407,7 @@ ftp_copyresult(int src, int dst, enum state state) if (!passivemode && rbuf[0] == '1') { if (ftp_activeconn() < 0) { n = snprintf(rbuf, sizeof(rbuf), - "425 Cannot open data connection\r\n"); + "425 Cannot open data connetion\r\n"); } } write(dst, rbuf, n); @@ -555,10 +557,10 @@ passivefail: p = (char *)&sin6->sin6_port; n = snprintf(sbuf, sizeof(sbuf), "228 Entering Long Passive Mode (%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d)\r\n", - 6, 16, UC(a[0]), UC(a[1]), UC(a[2]), UC(a[3]), - UC(a[4]), UC(a[5]), UC(a[6]), UC(a[7]), - UC(a[8]), UC(a[9]), UC(a[10]), UC(a[11]), - UC(a[12]), UC(a[13]), UC(a[14]), UC(a[15]), + 6, 16, UC(a[0]), UC(a[1]), UC(a[2]), UC(a[3]), + UC(a[4]), UC(a[5]), UC(a[6]), UC(a[7]), + UC(a[8]), UC(a[9]), UC(a[10]), UC(a[11]), + UC(a[12]), UC(a[13]), UC(a[14]), UC(a[15]), 2, UC(p[0]), UC(p[1])); write(dst, sbuf, n); passivemode = 1; @@ -676,7 +678,7 @@ passivefail2: p = (char *)&sin->sin_port; n = snprintf(sbuf, sizeof(sbuf), "227 Entering Passive Mode (%d,%d,%d,%d,%d,%d)\r\n", - UC(a[0]), UC(a[1]), UC(a[2]), UC(a[3]), + UC(a[0]), UC(a[1]), UC(a[2]), UC(a[3]), UC(p[0]), UC(p[1])); write(dst, sbuf, n); passivemode = 1; @@ -921,12 +923,7 @@ eprtparamfail: error = getaddrinfo(hostp, portp, &hints, &res); if (error) { n = snprintf(sbuf, sizeof(sbuf), - "501 EPRT: %s", gai_strerror(error)); - if (error == EAI_SYSTEM) - n += snprintf(sbuf, sizeof(sbuf), - ": %s", strerror(errno)); - n += snprintf(sbuf, sizeof(sbuf), "\r\n"); - + "501 EPRT: %s\r\n", gai_strerror(error)); write(src, sbuf, n); return n; } |