PERFORCE change 100987 for review

[Robert Watson]

http://perforce.freebsd.org/chv.cgi?CH=100987

Change 100987 by rwatson at rwatson_zoo on 2006/07/08 12:29:59

	Rename.

Affected files ...

.. //depot/projects/trustedbsd/mac2/sys/security/mac_seeotheruids/mac_seeotheruids.c#2 edit

Differences ...

==== //depot/projects/trustedbsd/mac2/sys/security/mac_seeotheruids/mac_seeotheruids.c#2 (text+ko) ====

@@ -1,6 +1,7 @@
 /*-
  * Copyright (c) 1999-2002 Robert N. M. Watson
  * Copyright (c) 2001-2002 Networks Associates Technology, Inc.
+ * Copyright (c) 2006 SPARTA, Inc.
  * All rights reserved.
  *
  * This software was developed by Robert Watson for the TrustedBSD Project.
@@ -10,6 +11,9 @@
  * Associates, Inc. under DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"),
  * as part of the DARPA CHATS research program.
  *
+ * This software was enhanced by SPARTA ISSO under SPAWAR contract
+ * N66001-04-C-6019 ("SEFOS").
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -134,14 +138,14 @@
 }
 
 static int
-mac_seeotheruids_check_cred_visible(struct ucred *u1, struct ucred *u2)
+mac_seeotheruids_cred_check_visible(struct ucred *u1, struct ucred *u2)
 {
 
 	return (mac_seeotheruids_check(u1, u2));
 }
 
 static int
-mac_seeotheruids_check_proc_signal(struct ucred *cred, struct proc *proc,
+mac_seeotheruids_proc_check_signal(struct ucred *cred, struct proc *proc,
     int signum)
 {
 
@@ -149,21 +153,21 @@
 }
 
 static int
-mac_seeotheruids_check_proc_sched(struct ucred *cred, struct proc *proc)
+mac_seeotheruids_proc_check_sched(struct ucred *cred, struct proc *proc)
 {
 
 	return (mac_seeotheruids_check(cred, proc->p_ucred));
 }
 
 static int
-mac_seeotheruids_check_proc_debug(struct ucred *cred, struct proc *proc)
+mac_seeotheruids_proc_check_debug(struct ucred *cred, struct proc *proc)
 {
 
 	return (mac_seeotheruids_check(cred, proc->p_ucred));
 }
 
 static int
-mac_seeotheruids_check_socket_visible(struct ucred *cred, struct socket *socket,
+mac_seeotheruids_socket_check_visible(struct ucred *cred, struct socket *socket,
     struct label *socketlabel)
 {
 
@@ -172,11 +176,11 @@
 
 static struct mac_policy_ops mac_seeotheruids_ops =
 {
-	.mpo_check_cred_visible = mac_seeotheruids_check_cred_visible,
-	.mpo_check_proc_debug = mac_seeotheruids_check_proc_debug,
-	.mpo_check_proc_sched = mac_seeotheruids_check_proc_sched,
-	.mpo_check_proc_signal = mac_seeotheruids_check_proc_signal,
-	.mpo_check_socket_visible = mac_seeotheruids_check_socket_visible,
+	.mpo_cred_check_visible = mac_seeotheruids_cred_check_visible,
+	.mpo_proc_check_debug = mac_seeotheruids_proc_check_debug,
+	.mpo_proc_check_sched = mac_seeotheruids_proc_check_sched,
+	.mpo_proc_check_signal = mac_seeotheruids_proc_check_signal,
+	.mpo_socket_check_visible = mac_seeotheruids_socket_check_visible,
 };
 
 MAC_POLICY_SET(&mac_seeotheruids_ops, mac_seeotheruids,