Date: Wed, 1 May 2002 14:34:06 -0700 (PDT) From: Robert Watson <rwatson@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 10600 for review Message-ID: <200205012134.g41LY6e86935@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10600 Change 10600 by rwatson@rwatson_curry on 2002/05/01 14:33:58 Change my mind: call it mac_create_socket_from_socket() rather than mac_accept_socket(), keeping consistency with the 'create' naming scheme, and permitting the call to be used more sensibly in other situations. Affected files ... ... //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#131 edit ... //depot/projects/trustedbsd/mac/sys/sys/mac.h#96 edit ... //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#59 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#131 (text+ko) ==== @@ -303,12 +303,13 @@ mpc->mpc_ops.mpo_create_mbuf_from_socket = mpe->mpe_function; break; - case MAC_ACCEPT_SOCKET: - mpc->mpc_ops.mpo_accept_socket = mpe->mpe_function; - break; case MAC_CREATE_SOCKET: mpc->mpc_ops.mpo_create_socket = mpe->mpe_function; break; + case MAC_CREATE_SOCKET_FROM_SOCKET: + mpc->mpc_ops.mpo_create_socket_from_socket = + mpe->mpe_function; + break; case MAC_RELABEL_SOCKET: mpc->mpc_ops.mpo_relabel_socket = mpe->mpe_function; break; @@ -1254,17 +1255,18 @@ } void -mac_accept_socket(struct socket *listenso, struct socket *acceptso) +mac_create_socket(struct ucred *cred, struct socket *socket) { - MAC_PERFORM(accept_socket, listenso, acceptso); + MAC_PERFORM(create_socket, cred, socket); } void -mac_create_socket(struct ucred *cred, struct socket *socket) +mac_create_socket_from_socket(struct socket *oldsocket, + struct socket *newsocket) { - MAC_PERFORM(create_socket, cred, socket); + MAC_PERFORM(create_socket_from_socket, oldsocket, newsocket); } static void ==== //depot/projects/trustedbsd/mac/sys/sys/mac.h#96 (text+ko) ==== @@ -292,7 +292,6 @@ struct ifnet *ifnet); /* Label creation events. */ -void mac_accept_socket(struct socket *listenso, struct socket *acceptso); void mac_create_bpfdesc(struct ucred *cred, struct bpf_d *bpf_d); void mac_create_devfs_device(dev_t dev, struct mac *devicelabel); void mac_create_devfs_directory(char *dirname, int dirnamelen, @@ -319,6 +318,8 @@ void mac_create_proc1(struct ucred *cred); void mac_create_root_mount(struct ucred *cred, struct mount *mp); void mac_create_socket(struct ucred *cred, struct socket *socket); +void mac_create_socket_from_socket(struct socket *oldsocket, + struct socket *newsocket); void mac_create_subject(struct ucred *cred_parent, struct ucred *cred_child); void mac_create_vnode_from_vnode(struct ucred *cred, struct vnode *parent, ==== //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#59 (text+ko) ==== @@ -87,12 +87,12 @@ /* * Labeling event operations: IPC objects. */ - void (*mpo_accept_socket)(struct socket *listenso, - struct socket *acceptso); void (*mpo_create_mbuf_from_socket)(struct socket *so, struct mbuf *m); void (*mpo_create_socket)(struct ucred *cred, struct socket *socket); + void (*mpo_create_socket_from_socket)(struct socket *oldsocket, + struct socket *newsocket); void (*mpo_relabel_socket)(struct ucred *cred, struct socket *socket, struct mac *newlabel); @@ -228,8 +228,8 @@ MAC_CREATE_MOUNT, MAC_CREATE_ROOT_MOUNT, MAC_CREATE_MBUF_FROM_SOCKET, - MAC_ACCEPT_SOCKET, MAC_CREATE_SOCKET, + MAC_CREATE_SOCKET_FROM_SOCKET, MAC_RELABEL_SOCKET, MAC_CREATE_BPFDESC, MAC_CREATE_IFNET, To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200205012134.g41LY6e86935>