diff options
| author | wollman <wollman@FreeBSD.org> | 1995-09-21 17:55:49 +0000 |
|---|---|---|
| committer | wollman <wollman@FreeBSD.org> | 1995-09-21 17:55:49 +0000 |
| commit | b4a12df8bbf12325135d03f0975d456d34d575a7 (patch) | |
| tree | 68460740f38235d1c0e81c4cc96c80bb32805dc7 /sys/netinet/in_pcb.c | |
| parent | 6bdd60bf36b1d10b5705bee97186f0b3f6f9351b (diff) | |
| download | FreeBSD-src-b4a12df8bbf12325135d03f0975d456d34d575a7.zip FreeBSD-src-b4a12df8bbf12325135d03f0975d456d34d575a7.tar.gz | |
Merge 4.4-Lite-2: use M_NOWAIT in in_pcballoc(), and return EACCES rather
than EPERM on illegal attempt to bind a reserved port.
Obtained from: 4.4BSD-Lite-2
Diffstat (limited to 'sys/netinet/in_pcb.c')
| -rw-r--r-- | sys/netinet/in_pcb.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/netinet/in_pcb.c b/sys/netinet/in_pcb.c index 6f8fe0e..834f13a 100644 --- a/sys/netinet/in_pcb.c +++ b/sys/netinet/in_pcb.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1982, 1986, 1991, 1993 + * Copyright (c) 1982, 1986, 1991, 1993, 1995 * The Regents of the University of California. All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -30,8 +30,8 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * @(#)in_pcb.c 8.2 (Berkeley) 1/4/94 - * $Id: in_pcb.c,v 1.11 1995/05/03 07:16:51 davidg Exp $ + * @(#)in_pcb.c 8.4 (Berkeley) 5/24/95 + * $Id: in_pcb.c,v 1.12 1995/05/30 08:09:28 rgrimes Exp $ */ #include <sys/param.h> @@ -137,7 +137,7 @@ in_pcbbind(inp, nam) /* GROSS */ if (ntohs(lport) < IPPORT_RESERVED && (error = suser(p->p_ucred, &p->p_acflag))) - return (error); + return (EACCES); t = in_pcblookup(head, zeroin_addr, 0, sin->sin_addr, lport, wild); if (t && (reuseport & t->inp_socket->so_options) == 0) |
