Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/netinet PR/46077: M. Nunberg: Stat should not fial on co...



details:   https://anonhg.NetBSD.org/src/rev/8c492d6d33f4
branches:  trunk
changeset: 778109:8c492d6d33f4
user:      christos <christos%NetBSD.org@localhost>
date:      Sat Mar 17 02:48:51 2012 +0000

description:
PR/46077: M. Nunberg: Stat should not fial on connecting socket.

diffstat:

 sys/netinet/tcp_usrreq.c |  12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diffs (34 lines):

diff -r 0cd19962c99d -r 8c492d6d33f4 sys/netinet/tcp_usrreq.c
--- a/sys/netinet/tcp_usrreq.c  Sat Mar 17 02:25:08 2012 +0000
+++ b/sys/netinet/tcp_usrreq.c  Sat Mar 17 02:48:51 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: tcp_usrreq.c,v 1.162 2012/02/02 19:43:07 tls Exp $     */
+/*     $NetBSD: tcp_usrreq.c,v 1.163 2012/03/17 02:48:51 christos Exp $        */
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -95,7 +95,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tcp_usrreq.c,v 1.162 2012/02/02 19:43:07 tls Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcp_usrreq.c,v 1.163 2012/03/17 02:48:51 christos Exp $");
 
 #include "opt_inet.h"
 #include "opt_ipsec.h"
@@ -267,11 +267,11 @@
         * a (struct inpcb) pointed at by the socket, and this
         * structure will point at a subsidary (struct tcpcb).
         */
-#ifndef INET6
-       if (inp == 0 && req != PRU_ATTACH)
-#else
-       if ((inp == 0 && in6p == 0) && req != PRU_ATTACH)
+       if ((inp == 0
+#ifdef INET6
+           && in6p == 0
 #endif
+           ) && (req != PRU_ATTACH && req != PRU_SENSE))
        {
                error = EINVAL;
                goto release;



Home | Main Index | Thread Index | Old Index