diff options
| author | David Gwynne <dlg@cvs.openbsd.org> | 2013-04-23 05:37:36 +0000 |
|---|---|---|
| committer | David Gwynne <dlg@cvs.openbsd.org> | 2013-04-23 05:37:36 +0000 |
| commit | c2c77a07fd1f2f8b25f95d57ca915758c11990af (patch) | |
| tree | 1faf8f5611a0f5dca0d19318c3bf70e226332919 /usr.sbin/identd | |
| parent | b418f04a93a04b078bea0995a63e540c29ca5cd2 (diff) | |
remove support for specifying which port you want to run on. there's no
point.
well argued by deraadt@
Diffstat (limited to 'usr.sbin/identd')
| -rw-r--r-- | usr.sbin/identd/identd.8 | 11 | ||||
| -rw-r--r-- | usr.sbin/identd/identd.c | 8 |
2 files changed, 3 insertions, 16 deletions
diff --git a/usr.sbin/identd/identd.8 b/usr.sbin/identd/identd.8 index 023529ae94b..98a8ac34bb6 100644 --- a/usr.sbin/identd/identd.8 +++ b/usr.sbin/identd/identd.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: identd.8,v 1.5 2013/04/23 01:55:45 dlg Exp $ +.\" $OpenBSD: identd.8,v 1.6 2013/04/23 05:37:35 dlg Exp $ .\" .\" Copyright (c) 2013 David Gwynne <dlg@openbsd.org> .\" @@ -24,7 +24,6 @@ .Nm .Op Fl 46d .Op Fl l Ar address -.Op Fl p Ar port .Op Fl t Ar timeout .Ar directory .Sh DESCRIPTION @@ -66,14 +65,6 @@ If this file is accessible, return instead of the normal USERID response. .It Fl n Always return UID numbers instead of usernames. -.It Fl p Ar port -Listen on the specified port. -By default -.Nm -listens on the port indicated in the -.Ql auth -service description; see -.Xr services 5 . .It Fl t Ar timeout Specifies the idle timeout for client connections, in seconds. diff --git a/usr.sbin/identd/identd.c b/usr.sbin/identd/identd.c index 7b3befb0c57..5f59fb6c2c5 100644 --- a/usr.sbin/identd/identd.c +++ b/usr.sbin/identd/identd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: identd.c,v 1.12 2013/04/23 01:55:45 dlg Exp $ */ +/* $OpenBSD: identd.c,v 1.13 2013/04/23 05:37:35 dlg Exp $ */ /* * Copyright (c) 2013 David Gwynne <dlg@openbsd.org> @@ -210,7 +210,6 @@ main(int argc, char *argv[]) struct passwd *pw; char *addr = NULL; - char *port = "auth"; int family = AF_UNSPEC; int pair[2]; @@ -237,9 +236,6 @@ main(int argc, char *argv[]) case 'n': parent_uprintf = parent_uid; break; - case 'p': - port = optarg; - break; case 't': timeout.tv_sec = strtonum(optarg, TIMEOUT_MIN, TIMEOUT_MAX, &errstr); @@ -313,7 +309,7 @@ main(int argc, char *argv[]) SIMPLEQ_INIT(&sc.child.pushing); SIMPLEQ_INIT(&sc.child.popping); - identd_listen(addr, port, family); + identd_listen(addr, "auth", family); if (chroot(pw->pw_dir) == -1) lerr(1, "chroot(%s)", pw->pw_dir); |