diff options
| -rw-r--r-- | usr.bin/finger/extern.h | 1 | ||||
| -rw-r--r-- | usr.bin/finger/finger.1 | 5 | ||||
| -rw-r--r-- | usr.bin/finger/finger.c | 5 | ||||
| -rw-r--r-- | usr.bin/finger/net.c | 8 |
4 files changed, 3 insertions, 16 deletions
diff --git a/usr.bin/finger/extern.h b/usr.bin/finger/extern.h index 29f3599..498c296 100644 --- a/usr.bin/finger/extern.h +++ b/usr.bin/finger/extern.h @@ -47,7 +47,6 @@ extern int lflag; extern time_t now; extern int oflag; extern int pplan; /* don't show .plan/.project */ -extern int Tflag; extern int invoker_root; /* Invoked by root */ void enter_lastlog(PERSON *); diff --git a/usr.bin/finger/finger.1 b/usr.bin/finger/finger.1 index a49c702..7a9cf55 100644 --- a/usr.bin/finger/finger.1 +++ b/usr.bin/finger/finger.1 @@ -40,7 +40,7 @@ .Nd user information lookup program .Sh SYNOPSIS .Nm -.Op Fl 46gklmpshoT +.Op Fl 46gklmpsho .Op Ar user ...\& .Op Ar user@host ...\& .Sh DESCRIPTION @@ -161,9 +161,6 @@ option is supplied. All name matching performed by .Nm is case insensitive. -.It Fl T -Disable the piggybacking of data on the initial connection request. -This option is needed to finger hosts with a broken TCP implementation. .El .Pp If no options are specified, diff --git a/usr.bin/finger/finger.c b/usr.bin/finger/finger.c index 5223c7d..675a964 100644 --- a/usr.bin/finger/finger.c +++ b/usr.bin/finger/finger.c @@ -91,7 +91,7 @@ __FBSDID("$FreeBSD$"); DB *db; time_t now; -int entries, gflag, kflag, lflag, mflag, pplan, sflag, oflag, Tflag; +int entries, gflag, kflag, lflag, mflag, pplan, sflag, oflag; sa_family_t family = PF_UNSPEC; int d_first = -1; char tbuf[1024]; @@ -141,9 +141,6 @@ option(int argc, char **argv) case 'o': oflag = 1; /* office info */ break; - case 'T': - Tflag = 1; /* disable T/TCP */ - break; case '?': default: usage(); diff --git a/usr.bin/finger/net.c b/usr.bin/finger/net.c index 2bd35ad..5260a2d 100644 --- a/usr.bin/finger/net.c +++ b/usr.bin/finger/net.c @@ -144,13 +144,7 @@ do_protocol(const char *name, const struct addrinfo *ai) iov[msg.msg_iovlen].iov_base = neteol; iov[msg.msg_iovlen++].iov_len = 2; - /* - * -T disables data-on-SYN: compatibility option to finger broken - * hosts. Also, the implicit-open API is broken on IPv6, so do - * the explicit connect there, too. - */ - if ((Tflag || ai->ai_addr->sa_family == AF_INET6) - && connect(s, ai->ai_addr, ai->ai_addrlen) < 0) { + if (connect(s, ai->ai_addr, ai->ai_addrlen) < 0) { warn("connect"); close(s); return -1; |
