d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove T/TCP support, and the -T option which was needed to disable it.

Browse Source 
MFC after:	3 weeks
This commit is contained in:
des 2007-04-11 19:11:54 +00:00
parent 974e289f93
commit 260758a263
4 changed files with 3 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
usr.bin/finger/extern.h
View File

@ -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 *);

5
usr.bin/finger/finger.1
View File

@ -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,

5
usr.bin/finger/finger.c
View File

@ -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();

8
usr.bin/finger/net.c
View File

@ -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;