Date: Wed, 15 Oct 2003 06:37:23 -0700 (PDT) From: Chris Vance <cvance@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 39744 for review Message-ID: <200310151337.h9FDbNde070273@repoman.freebsd.org>
index | next in thread | raw e-mail
http://perforce.freebsd.org/chv.cgi?CH=39744 Change 39744 by cvance@cvance_osx_laptop on 2003/10/15 06:36:36 Fix module registration errors with the sebsd module. Credit goes to areisse for being the first one to trip on these... Affected files ... .. //depot/projects/trustedbsd/sedarwin/apsl/xnu/bsd/kern/kern_mac.c#19 edit .. //depot/projects/trustedbsd/sedarwin/apsl/xnu/security/sebsd/sebsd.c#4 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin/apsl/xnu/bsd/kern/kern_mac.c#19 (text+ko) ==== @@ -370,11 +370,11 @@ * request. Note that it returns its value via 'error' in the scope * of the caller. */ -#define MAC_CHECK(check, args...) do { \ +#define nMAC_CHECK(check, args...) do { \ error = 0; \ } while (0) -#define oMAC_CHECK(check, args...) do { \ +#define MAC_CHECK(check, args...) do { \ struct mac_policy_conf *mpc; \ int entrycount; \ \ @@ -514,14 +514,6 @@ } while (0) -static void -mac_register_module(struct mac_policy_conf *mpconf) -{ - - printf("MAC Framework registering policy: %s\n", mpconf->mpc_name); -} - - /* * Initialize the MAC subsystem, including appropriate SMP locks. */ @@ -582,7 +574,7 @@ printf("MAC: init mac_test\n"); mac_policy_register(&test_mac_policy_conf); printf("MAC: init sebsd\n"); - mac_register_module(&sebsd_mac_policy_conf); + mac_policy_register(&sebsd_mac_policy_conf); mac_late = 1; } ==== //depot/projects/trustedbsd/sedarwin/apsl/xnu/security/sebsd/sebsd.c#4 (text+ko) ==== @@ -2292,6 +2292,6 @@ "NSA/NAI Labs Security Enhanced BSD", /* full name */ &sebsd_ops, /* policy operations */ 0, /* loadtime flags*/ - 1, /* security field */ + &slot, /* security field */ 0 /* runtime flags */ };home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200310151337.h9FDbNde070273>