diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 1996-08-04 15:54:44 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 1996-08-04 15:54:44 +0000 |
| commit | 18f87ef6a3595ce478f0a8f3dfd5b9e10132d233 (patch) | |
| tree | b6fac75c60a8c5fee760a14147f8149d9ded1119 /usr.sbin/amd/amq | |
| parent | 47dc94a94db59eb276035a8e2cb09c7533f43631 (diff) | |
bzero sin, bindresvport
Diffstat (limited to 'usr.sbin/amd/amq')
| -rw-r--r-- | usr.sbin/amd/amq/amq.c | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/usr.sbin/amd/amq/amq.c b/usr.sbin/amd/amq/amq.c index a332452bd6d..92895cfe3c0 100644 --- a/usr.sbin/amd/amq/amq.c +++ b/usr.sbin/amd/amq/amq.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * from: @(#)amq.c 8.1 (Berkeley) 6/7/93 - * $Id: amq.c,v 1.1 1995/10/18 08:47:13 deraadt Exp $ + * $Id: amq.c,v 1.2 1996/08/04 15:54:43 deraadt Exp $ */ /* @@ -52,7 +52,7 @@ char copyright[] = "\ #endif /* not lint */ #ifndef lint -static char rcsid[] = "$Id: amq.c,v 1.1 1995/10/18 08:47:13 deraadt Exp $"; +static char rcsid[] = "$Id: amq.c,v 1.2 1996/08/04 15:54:43 deraadt Exp $"; static char sccsid[] = "@(#)amq.c 8.1 (Berkeley) 6/7/93"; #endif /* not lint */ @@ -612,27 +612,21 @@ Usage: %s [-h host] [[-f] [-m] [-v] [-s]] | [[-u] directory ...]] |\n\ static int inetresport(ty) int ty; { - int alport; struct sockaddr_in addr; int sock; /* Use internet address family */ + bzero(&addr, sizeof addr); addr.sin_family = AF_INET; addr.sin_addr.s_addr = INADDR_ANY; if ((sock = socket(AF_INET, ty, 0)) < 0) return -1; - for (alport = IPPORT_RESERVED-1; alport > IPPORT_RESERVED/2 + 1; alport--) { - addr.sin_port = htons((u_short)alport); - if (bind(sock, (struct sockaddr *)&addr, sizeof (addr)) >= 0) - return sock; - if (errno != EADDRINUSE) { - close(sock); - return -1; - } + if (bindresvport(sock, &addr) < 0) { + close(sock); + errno = EAGAIN; + return -1; } - close(sock); - errno = EAGAIN; - return -1; + return sock; } /* |