BSD 4_3_Net_2 release

[unix-history] / usr / src / sys / netiso / tp_output.c

diff --git a/usr/src/sys/netiso/tp_output.c b/usr/src/sys/netiso/tp_output.c
index 270e98b..d2611c3 100644 (file)
--- a/usr/src/sys/netiso/tp_output.c
+++ b/usr/src/sys/netiso/tp_output.c
@@ -1,3 +1,38 @@
+/*-
+ * Copyright (c) 1991 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *     This product includes software developed by the University of
+ *     California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *     @(#)tp_output.c 7.10 (Berkeley) 6/27/91
+ */
+

 /***********************************************************
                Copyright IBM Corporation 1987
 
 /***********************************************************
                Copyright IBM Corporation 1987
 


@@ -29,23 +64,16 @@ SOFTWARE.
  *
  * $Header: tp_output.c,v 5.4 88/11/18 17:28:08 nhall Exp $
  * $Source: /usr/argo/sys/netiso/RCS/tp_output.c,v $
  *
  * $Header: tp_output.c,v 5.4 88/11/18 17:28:08 nhall Exp $
  * $Source: /usr/argo/sys/netiso/RCS/tp_output.c,v $

- *     @(#)tp_output.c 7.8 (Berkeley) %G% *

  *
  * In here is tp_ctloutput(), the guy called by [sg]etsockopt(),
  */
 
  *
  * In here is tp_ctloutput(), the guy called by [sg]etsockopt(),
  */
 

-#ifndef lint
-static char *rcsid = "$Header: tp_output.c,v 5.4 88/11/18 17:28:08 nhall Exp $";
-#endif lint
-

 #include "param.h"
 #include "mbuf.h"
 #include "systm.h"
 #include "socket.h"
 #include "socketvar.h"
 #include "protosw.h"
 #include "param.h"
 #include "mbuf.h"
 #include "systm.h"
 #include "socket.h"
 #include "socketvar.h"
 #include "protosw.h"

-#include "user.h"
-#include "kernel.h"

 #include "errno.h"
 #include "time.h"
 #include "tp_param.h"
 #include "errno.h"
 #include "time.h"
 #include "tp_param.h"


@@ -57,6 +85,7 @@ static char *rcsid = "$Header: tp_output.c,v 5.4 88/11/18 17:28:08 nhall Exp $";
 #include "argo_debug.h"
 #include "tp_pcb.h"
 #include "tp_trace.h"
 #include "argo_debug.h"
 #include "tp_pcb.h"
 #include "tp_trace.h"

+#include "kernel.h"

 
 #define USERFLAGSMASK_G 0x0f00643b
 #define USERFLAGSMASK_S 0x0f000432
 
 #define USERFLAGSMASK_G 0x0f00643b
 #define USERFLAGSMASK_S 0x0f000432


@@ -428,9 +457,10 @@ tp_ctloutput(cmd, so, level, optname, mp)
        switch (optname) {
 
        case TPOPT_INTERCEPT:
        switch (optname) {
 
        case TPOPT_INTERCEPT:

-               if (error = suser(u.u_cred, &u.u_acflag))
+               if ((so->so_state & SS_PRIV) == 0) {
+                       error = EPERM;

                        break;
                        break;

-               else if (cmd != PRCO_SETOPT || tpcb->tp_state != TP_LISTENING)
+               } else if (cmd != PRCO_SETOPT || tpcb->tp_state != TP_LISTENING)

                        error = EINVAL;
                else {
                        register struct tp_pcb *t = 0;
                        error = EINVAL;
                else {
                        register struct tp_pcb *t = 0;