svn commit: r303455 - in head/sys: netinet sys
Stephen J. Kiernan
stevek at FreeBSD.org
Thu Jul 28 18:39:31 UTC 2016
Author: stevek
Date: Thu Jul 28 18:39:30 2016
New Revision: 303455
URL: https://svnweb.freebsd.org/changeset/base/303455
Log:
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
Modified:
head/sys/netinet/in_prot.c
head/sys/sys/proc.h
head/sys/sys/systm.h
Modified: head/sys/netinet/in_prot.c
==============================================================================
--- head/sys/netinet/in_prot.c Thu Jul 28 17:37:12 2016 (r303454)
+++ head/sys/netinet/in_prot.c Thu Jul 28 18:39:30 2016 (r303455)
@@ -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
*/
/*
Modified: head/sys/sys/proc.h
==============================================================================
--- head/sys/sys/proc.h Thu Jul 28 17:37:12 2016 (r303454)
+++ head/sys/sys/proc.h Thu Jul 28 18:39:30 2016 (r303455)
@@ -971,6 +971,10 @@ int pget(pid_t pid, int flags, struct pr
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);
Modified: head/sys/sys/systm.h
==============================================================================
--- head/sys/sys/systm.h Thu Jul 28 17:37:12 2016 (r303454)
+++ head/sys/sys/systm.h Thu Jul 28 18:39:30 2016 (r303455)
@@ -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);
More information about the svn-src-head
mailing list