From owner-p4-projects Wed Oct 30 10:52: 0 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A7B7937B401; Wed, 30 Oct 2002 10:51:55 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3F60E37B406 for ; Wed, 30 Oct 2002 10:51:55 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E18C243E97 for ; Wed, 30 Oct 2002 10:51:53 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id g9UIobmV072522 for ; Wed, 30 Oct 2002 10:50:37 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id g9UIobPq072519 for perforce@freebsd.org; Wed, 30 Oct 2002 10:50:37 -0800 (PST) Date: Wed, 30 Oct 2002 10:50:37 -0800 (PST) Message-Id: <200210301850.g9UIobPq072519@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 20435 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=20435 Change 20435 by rwatson@rwatson_tislabs on 2002/10/30 10:49:38 Rename proc label entry points to be consistent with out label initialization/destruction entry points; remove proc argument passing in only label, also. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#342 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_lomac/mac_lomac.c#29 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_test/mac_test.c#73 edit .. //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#160 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#342 (text+ko) ==== @@ -752,7 +752,7 @@ { mac_init_label(&p->p_label); - MAC_PERFORM(init_proc, p, &p->p_label); + MAC_PERFORM(init_proc_label, &p->p_label); #ifdef MAC_DEBUG atomic_add_int(&nmacprocs, 1); #endif @@ -945,7 +945,7 @@ mac_destroy_proc(struct proc *p) { - MAC_PERFORM(destroy_proc, p, &p->p_label); + MAC_PERFORM(destroy_proc_label, &p->p_label); mac_destroy_label(&p->p_label); #ifdef MAC_DEBUG atomic_subtract_int(&nmacprocs, 1); ==== //depot/projects/trustedbsd/mac/sys/security/mac_lomac/mac_lomac.c#29 (text+ko) ==== @@ -565,7 +565,7 @@ } static void -mac_lomac_init_proc_label(struct proc *p, struct label *label) +mac_lomac_init_proc_label(struct label *label) { PSLOT(label) = malloc(sizeof(struct mac_lomac_proc), M_MACLOMAC, @@ -582,7 +582,7 @@ } static void -mac_lomac_destroy_proc_label(struct proc *p, struct label *label) +mac_lomac_destroy_proc_label(struct label *label) { mtx_destroy(&PSLOT(label)->mtx); @@ -2489,7 +2489,7 @@ .mpo_init_mount_label = mac_lomac_init_label, .mpo_init_mount_fs_label = mac_lomac_init_label, .mpo_init_pipe_label = mac_lomac_init_label, - .mpo_init_proc = mac_lomac_init_proc_label, + .mpo_init_proc_label = mac_lomac_init_proc_label, .mpo_init_socket_label = mac_lomac_init_label_waitcheck, .mpo_init_socket_peer_label = mac_lomac_init_label_waitcheck, .mpo_init_vnode_label = mac_lomac_init_label, @@ -2502,7 +2502,7 @@ .mpo_destroy_mount_label = mac_lomac_destroy_label, .mpo_destroy_mount_fs_label = mac_lomac_destroy_label, .mpo_destroy_pipe_label = mac_lomac_destroy_label, - .mpo_destroy_proc = mac_lomac_destroy_proc_label, + .mpo_destroy_proc_label = mac_lomac_destroy_proc_label, .mpo_destroy_socket_label = mac_lomac_destroy_label, .mpo_destroy_socket_peer_label = mac_lomac_destroy_label, .mpo_destroy_vnode_label = mac_lomac_destroy_label, ==== //depot/projects/trustedbsd/mac/sys/security/mac_test/mac_test.c#73 (text+ko) ==== @@ -305,7 +305,7 @@ } static void -mac_test_init_proc(struct proc *p, struct label *label) +mac_test_init_proc_label(struct label *label) { SLOT(label) = PROCMAGIC; @@ -475,7 +475,7 @@ } static void -mac_test_destroy_proc(struct proc *p, struct label *label) +mac_test_destroy_proc_label(struct label *label) { if ((SLOT(label) == PROCMAGIC || SLOT(label) == 0)) { @@ -1337,7 +1337,7 @@ .mpo_init_mount_label = mac_test_init_mount_label, .mpo_init_mount_fs_label = mac_test_init_mount_fs_label, .mpo_init_pipe_label = mac_test_init_pipe_label, - .mpo_init_proc = mac_test_init_proc, + .mpo_init_proc_label = mac_test_init_proc_label, .mpo_init_socket_label = mac_test_init_socket_label, .mpo_init_socket_peer_label = mac_test_init_socket_peer_label, .mpo_init_vnode_label = mac_test_init_vnode_label, @@ -1350,7 +1350,7 @@ .mpo_destroy_mount_label = mac_test_destroy_mount_label, .mpo_destroy_mount_fs_label = mac_test_destroy_mount_fs_label, .mpo_destroy_pipe_label = mac_test_destroy_pipe_label, - .mpo_destroy_proc = mac_test_destroy_proc, + .mpo_destroy_proc_label = mac_test_destroy_proc_label, .mpo_destroy_socket_label = mac_test_destroy_socket_label, .mpo_destroy_socket_peer_label = mac_test_destroy_socket_peer_label, .mpo_destroy_vnode_label = mac_test_destroy_vnode_label, ==== //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#160 (text+ko) ==== @@ -83,7 +83,7 @@ int (*mpo_init_socket_label)(struct label *label, int flag); int (*mpo_init_socket_peer_label)(struct label *label, int flag); void (*mpo_init_pipe_label)(struct label *label); - void (*mpo_init_proc)(struct proc *p, struct label *label); + void (*mpo_init_proc_label)(struct label *label); void (*mpo_init_vnode_label)(struct label *label); void (*mpo_destroy_bpfdesc_label)(struct label *label); void (*mpo_destroy_cred_label)(struct label *label); @@ -96,7 +96,7 @@ void (*mpo_destroy_socket_label)(struct label *label); void (*mpo_destroy_socket_peer_label)(struct label *label); void (*mpo_destroy_pipe_label)(struct label *label); - void (*mpo_destroy_proc)(struct proc *p, struct label *label); + void (*mpo_destroy_proc_label)(struct label *label); void (*mpo_destroy_vnode_label)(struct label *label); void (*mpo_copy_pipe_label)(struct label *src, struct label *dest); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message