trailing comment after #else or #endif

[unix-history] / usr / src / sys / netns / idp_usrreq.c

diff --git a/usr/src/sys/netns/idp_usrreq.c b/usr/src/sys/netns/idp_usrreq.c
index c50866d..0905016 100644 (file)
--- a/usr/src/sys/netns/idp_usrreq.c
+++ b/usr/src/sys/netns/idp_usrreq.c
@@ -4,28 +4,27 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)idp_usrreq.c        7.10 (Berkeley) %G%
+ *     @(#)idp_usrreq.c        7.13 (Berkeley) %G%

  */
 
  */
 

-#include "param.h"
-#include "user.h"
-#include "malloc.h"
-#include "mbuf.h"
-#include "protosw.h"
-#include "socket.h"
-#include "socketvar.h"
-#include "errno.h"
-#include "stat.h"
-
-#include "../net/if.h"
-#include "../net/route.h"
-
-#include "ns.h"
-#include "ns_pcb.h"
-#include "ns_if.h"
-#include "idp.h"
-#include "idp_var.h"
-#include "ns_error.h"
+#include <sys/param.h>
+#include <sys/malloc.h>
+#include <sys/mbuf.h>
+#include <sys/protosw.h>
+#include <sys/socket.h>
+#include <sys/socketvar.h>
+#include <sys/errno.h>
+#include <sys/stat.h>
+
+#include <net/if.h>
+#include <net/route.h>
+
+#include <netns/ns.h>
+#include <netns/ns_pcb.h>
+#include <netns/ns_if.h>
+#include <netns/idp.h>
+#include <netns/idp_var.h>
+#include <netns/ns_error.h>

 
 /*
  * IDP protocol implementation.
 
 /*
  * IDP protocol implementation.


@@ -228,7 +227,7 @@ idp_output(nsp, m0)
                }
        }
        nsp->nsp_lastdst = idp->idp_dna;
                }
        }
        nsp->nsp_lastdst = idp->idp_dna;

-#endif ancient_history
+#endif /* ancient_history */

        if (noIdpRoute) ro = 0;
        return (ns_output(m, ro, so->so_options & SO_BROADCAST));
 }
        if (noIdpRoute) ro = 0;
        return (ns_output(m, ro, so->so_options & SO_BROADCAST));
 }


@@ -332,7 +331,7 @@ idp_ctloutput(req, so, level, name, value)
                case SO_NSIP_ROUTE:
                        error = nsip_route(*value);
                        break;
                case SO_NSIP_ROUTE:
                        error = nsip_route(*value);
                        break;

-#endif NSIP
+#endif /* NSIP */

                default:
                        error = EINVAL;
                }
                default:
                        error = EINVAL;
                }


@@ -519,7 +518,7 @@ idp_raw_usrreq(so, req, m, nam, control)
 
        case PRU_ATTACH:
 
 
        case PRU_ATTACH:
 

-               if (suser(u.u_cred, &u.u_acflag) || (nsp != NULL)) {
+               if (!(so->so_state & SS_PRIV) || (nsp != NULL)) {

                        error = EINVAL;
                        break;
                }
                        error = EINVAL;
                        break;
                }