PERFORCE change 41844 for review
Robert Watson
rwatson at FreeBSD.org
Mon Nov 10 00:28:51 GMT 2003
http://perforce.freebsd.org/chv.cgi?CH=41844
Change 41844 by rwatson at rwatson_paprika on 2003/11/09 16:28:45
Minor cleanup some whitespace: no trailing whitespace, tabs not
spaces, et al. Moves us closer to FreeBSD's style(9).
Affected files ...
.. //depot/projects/trustedbsd/sebsd/sys/security/sebsd/sebsd.c#26 edit
Differences ...
==== //depot/projects/trustedbsd/sebsd/sys/security/sebsd/sebsd.c#26 (text+ko) ====
@@ -414,7 +414,7 @@
struct ipc_security_struct *ipcsec;
ipcsec = SLOT(label);
- bzero(ipcsec, sizeof(struct ipc_security_struct));
+ bzero(ipcsec, sizeof(struct ipc_security_struct));
ipcsec->sid = SECINITSID_UNLABELED;
}
@@ -547,7 +547,7 @@
}
static void
-sebsd_create_ipc_msgmsg(struct ucred *cred, struct msqid_kernel *msqkptr,
+sebsd_create_ipc_msgmsg(struct ucred *cred, struct msqid_kernel *msqkptr,
struct label *msqlabel, struct msg *msgptr, struct label *msglabel)
{
struct task_security_struct *tsec;
@@ -564,9 +564,9 @@
/* XXX should we return an error if security_transition_sid,
* Or, should we assign the msg object the thread sid?
*/
- if(security_transition_sid(tsec->sid, msqsec->sid,
+ if(security_transition_sid(tsec->sid, msqsec->sid,
SECCLASS_MSG, &msgsec->sid) < 0) {
- printf("Warning: security_transition_sid failed on"
+ printf("Warning: security_transition_sid failed on"
"create_ipc_msgmsg\n");
printf("Assigning the requesting thread's sid to the msg\n");
msgsec->sid = tsec->sid;
@@ -2116,7 +2116,7 @@
struct label *msglabel)
{
- return(ipc_has_perm(cred, msglabel, MSG__DESTROY));
+ return(ipc_has_perm(cred, msglabel, MSG__DESTROY));
}
static int
@@ -2143,7 +2143,7 @@
{
int rc;
struct task_security_struct *task;
- struct ipc_security_struct *msgsec;
+ struct ipc_security_struct *msgsec;
struct ipc_security_struct *msqsec;
task = SLOT(cred->cr_label);
@@ -2174,7 +2174,7 @@
}
static int
-sebsd_check_ipc_msqctl(struct ucred *cred, struct msqid_kernel *msqkptr,
+sebsd_check_ipc_msqctl(struct ucred *cred, struct msqid_kernel *msqkptr,
struct label *msqklabel, int cmd)
{
access_vector_t perm;
@@ -2253,9 +2253,9 @@
access_vector_t perm;
perm = 0UL;
- if( accesstype & SEM_R )
+ if (accesstype & SEM_R)
perm = SEM__READ;
- if( accesstype & SEM_A )
+ if (accesstype & SEM_A)
perm = SEM__READ | SEM__WRITE;
return(ipc_has_perm(cred, semaklabel, perm));
@@ -2373,9 +2373,9 @@
.mpo_init_file_label = sebsd_init_file_label,
.mpo_init_ifnet_label = sebsd_init_network_label,
.mpo_init_ipc_msgmsg_label = sebsd_init_ipc_label,
- .mpo_init_ipc_msgqueue_label = sebsd_init_ipc_label,
- .mpo_init_ipc_sema_label = sebsd_init_ipc_label,
- .mpo_init_ipc_shm_label = sebsd_init_ipc_label,
+ .mpo_init_ipc_msgqueue_label = sebsd_init_ipc_label,
+ .mpo_init_ipc_sema_label = sebsd_init_ipc_label,
+ .mpo_init_ipc_shm_label = sebsd_init_ipc_label,
.mpo_init_ipq_label = sebsd_init_network_label_waitcheck,
.mpo_init_mbuf_label = sebsd_init_network_label_waitcheck,
.mpo_init_mount_label = sebsd_init_mount_label,
@@ -2393,9 +2393,9 @@
.mpo_destroy_devfsdirent_label = sebsd_destroy_label,
.mpo_destroy_ifnet_label = sebsd_destroy_label,
.mpo_destroy_ipc_msgmsg_label = sebsd_destroy_label,
- .mpo_destroy_ipc_msgqueue_label = sebsd_destroy_label,
- .mpo_destroy_ipc_sema_label = sebsd_destroy_label,
- .mpo_destroy_ipc_shm_label = sebsd_destroy_label,
+ .mpo_destroy_ipc_msgqueue_label = sebsd_destroy_label,
+ .mpo_destroy_ipc_sema_label = sebsd_destroy_label,
+ .mpo_destroy_ipc_shm_label = sebsd_destroy_label,
.mpo_destroy_ipq_label = sebsd_destroy_label,
.mpo_destroy_mbuf_label = sebsd_destroy_label,
.mpo_destroy_file_label = sebsd_destroy_label,
@@ -2453,9 +2453,9 @@
.mpo_create_devfs_symlink = sebsd_create_devfs_symlink,
.mpo_create_file = sebsd_create_file,
.mpo_create_ipc_msgmsg = sebsd_create_ipc_msgmsg,
- .mpo_create_ipc_msgqueue = sebsd_create_ipc_msgqueue,
- .mpo_create_ipc_sema = sebsd_create_ipc_sema,
- .mpo_create_ipc_shm = sebsd_create_ipc_shm,
+ .mpo_create_ipc_msgqueue = sebsd_create_ipc_msgqueue,
+ .mpo_create_ipc_sema = sebsd_create_ipc_sema,
+ .mpo_create_ipc_shm = sebsd_create_ipc_shm,
/* .mpo_create_mbuf_from_socket = sebsd_create_mbuf_from_socket, */
.mpo_create_mount = sebsd_create_mount,
.mpo_create_pipe = sebsd_create_pipe,
@@ -2569,8 +2569,8 @@
/*.mpo_set_socket_peer_from_mbuf = sebsd_set_socket_peer_from_mbuf,*/
/*.mpo_set_socket_peer_from_socket = sebsd_set_socket_peer_from_socket,*/
.mpo_cleanup_ipc_msgmsg = sebsd_cleanup_ipc_label,
- .mpo_cleanup_ipc_msgqueue = sebsd_cleanup_ipc_label,
- .mpo_cleanup_ipc_sema = sebsd_cleanup_ipc_label,
+ .mpo_cleanup_ipc_msgqueue = sebsd_cleanup_ipc_label,
+ .mpo_cleanup_ipc_sema = sebsd_cleanup_ipc_label,
.mpo_cleanup_ipc_shm = sebsd_cleanup_ipc_label,
.mpo_syscall = sebsd_syscall,
};
To Unsubscribe: send mail to majordomo at trustedbsd.org
with "unsubscribe trustedbsd-cvs" in the body of the message
More information about the trustedbsd-cvs
mailing list