From f11ec7984274349ab27010b124caf681a14cf454 Mon Sep 17 00:00:00 2001 From: "Stephen J. Kiernan" Date: Thu, 28 Jul 2016 18:39:30 +0000 Subject: [PATCH] Remove BSD and USL copyright and update license block in in_prot.c, as the code in this file was written by Robert N. M. Waston. Move cr_can* prototypes from sys/systm.h to sys/proc.h Reported by: rwatson Reviewed by: rwatson Approved by: sjg (mentor) Differential Revision: https://reviews.freebsd.org/D7345 --- sys/netinet/in_prot.c | 16 ++-------------- sys/sys/proc.h | 4 ++++ sys/sys/systm.h | 5 ----- 3 files changed, 6 insertions(+), 19 deletions(-) diff --git a/sys/netinet/in_prot.c b/sys/netinet/in_prot.c index 092eac32d764..8e685c187c61 100644 --- a/sys/netinet/in_prot.c +++ b/sys/netinet/in_prot.c @@ -1,15 +1,7 @@ /*- - * Copyright (c) 1982, 1986, 1989, 1990, 1991, 1993 - * The Regents of the University of California. - * (c) UNIX System Laboratories, Inc. * Copyright (c) 2000-2001 Robert N. M. Watson. * All rights reserved. * - * All or some portions of this file are derived from material licensed - * to the University of California by American Telephone and Telegraph - * Co. or Unix System Laboratories, Inc. and are reproduced herein with - * the permission of UNIX System Laboratories, Inc. - * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -18,14 +10,11 @@ * 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. - * 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 + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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 + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR 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) @@ -34,7 +23,6 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * @(#)kern_prot.c 8.6 (Berkeley) 1/21/94 */ /* diff --git a/sys/sys/proc.h b/sys/sys/proc.h index d6c6b65dd8bd..bb014472e814 100644 --- a/sys/sys/proc.h +++ b/sys/sys/proc.h @@ -971,6 +971,10 @@ int pget(pid_t pid, int flags, struct proc **pp); void ast(struct trapframe *framep); struct thread *choosethread(void); +int cr_cansee(struct ucred *u1, struct ucred *u2); +int cr_canseesocket(struct ucred *cred, struct socket *so); +int cr_canseeothergids(struct ucred *u1, struct ucred *u2); +int cr_canseeotheruids(struct ucred *u1, struct ucred *u2); int cr_cansignal(struct ucred *cred, struct proc *proc, int signum); int enterpgrp(struct proc *p, pid_t pgid, struct pgrp *pgrp, struct session *sess); diff --git a/sys/sys/systm.h b/sys/sys/systm.h index c214f328c702..3d0700ed6d74 100644 --- a/sys/sys/systm.h +++ b/sys/sys/systm.h @@ -313,11 +313,6 @@ extern int cpu_deepest_sleep; extern int cpu_disable_c2_sleep; extern int cpu_disable_c3_sleep; -int cr_cansee(struct ucred *u1, struct ucred *u2); -int cr_canseesocket(struct ucred *cred, struct socket *so); -int cr_canseeothergids(struct ucred *u1, struct ucred *u2); -int cr_canseeotheruids(struct ucred *u1, struct ucred *u2); - char *kern_getenv(const char *name); void freeenv(char *env); int getenv_int(const char *name, int *data);