Date: Wed, 17 Apr 2002 11:45:16 -0700 (PDT) From: Brian Feldman <green@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 9927 for review Message-ID: <200204171845.g3HIjGG49156@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9927 Change 9927 by green@green_laptop_2 on 2002/04/17 11:44:26 Fix warnings. Affected files ... ... //depot/projects/trustedbsd/mac/sys/kern/vfs_lookup.c#11 edit ... //depot/projects/trustedbsd/mac/sys/security/lomac/kernel_log.c#4 edit ... //depot/projects/trustedbsd/mac/sys/security/lomac/kernel_log.h#3 edit ... //depot/projects/trustedbsd/mac/sys/security/lomac/kernel_mediate.c#3 edit ... //depot/projects/trustedbsd/mac/sys/security/lomac/kernel_mediate.h#3 edit ... //depot/projects/trustedbsd/mac/sys/security/lomac/kernel_util.c#6 edit ... //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#29 edit ... //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#23 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/vfs_lookup.c#11 (text+ko) ==== @@ -264,7 +264,7 @@ #endif /* MAC */ } else { #ifdef MAC - const struct ucred *cred = td->td_ucred; + struct ucred *cred = td->td_ucred; /* * We know it's ISLASTCN, so do the MAC delete, rename, ==== //depot/projects/trustedbsd/mac/sys/security/lomac/kernel_log.c#4 (text+ko) ==== @@ -130,7 +130,7 @@ */ void -log_append_subject_id(lomac_log_t *s, const lomac_subject_t *p_subject) { +log_append_subject_id(lomac_log_t *s, lomac_subject_t *p_subject) { uid_t uid; pid_t pgid; ==== //depot/projects/trustedbsd/mac/sys/security/lomac/kernel_log.h#3 (text+ko) ==== @@ -70,7 +70,7 @@ lomac_log_t *log_start( void ); void log_append_string( lomac_log_t *s, const char *data_s ); void log_append_int( lomac_log_t *s, int data ); -void log_append_subject_id( lomac_log_t *s, const lomac_subject_t *p_subject ); +void log_append_subject_id( lomac_log_t *s, lomac_subject_t *p_subject ); void log_append_object_id( lomac_log_t *s, const lomac_object_t *p_object ); void log_print( lomac_log_t *s ); ==== //depot/projects/trustedbsd/mac/sys/security/lomac/kernel_mediate.c#3 (text+ko) ==== @@ -76,7 +76,7 @@ int mediate_subject_level_subject(const char *op_s, - const lomac_subject_t *p_subject_one, level_t level_one, + lomac_subject_t *p_subject_one, level_t level_one, lomac_subject_t *p_subject_two) { lattr_t lattr_two; /* lattr of `p_subject_two' */ ==== //depot/projects/trustedbsd/mac/sys/security/lomac/kernel_mediate.h#3 (text+ko) ==== @@ -41,7 +41,7 @@ #include "kernel_interface.h" int mediate_subject_level_subject( const char *op_s, - const lomac_subject_t *p_subject_one, + lomac_subject_t *p_subject_one, level_t level_one, lomac_subject_t *p_subject_two ); int mediate_subject_object( const char *op_s, lomac_subject_t *p_subject, ==== //depot/projects/trustedbsd/mac/sys/security/lomac/kernel_util.c#6 (text+ko) ==== @@ -109,6 +109,7 @@ } } +#ifdef P_CAN_HOOKS static int lomac_proc_candebug(struct proc *p1, struct proc *p2) { lattr_t lattr; @@ -145,7 +146,7 @@ else return (EPERM); } - +#endif int lomac_initialize_procs(void) { @@ -213,8 +214,6 @@ struct linker_file *parent, struct mod_depend *verinfo, struct linker_file **lfpp); -MALLOC_DECLARE(M_LINKER); - /* * MPSAFE */ ==== //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#29 (text+ko) ==== @@ -290,6 +290,7 @@ labelto->m_biba.mb_flags |= MAC_BIBA_FLAG_SINGLE; } +#if 0 static void mac_biba_copy_range(struct mac *labelfrom, struct mac *labelto) { @@ -300,6 +301,7 @@ sizeof(labelto->m_biba.mb_rangehigh)); labelto->m_biba.mb_flags |= MAC_BIBA_FLAG_RANGE; } +#endif /* * Initialize system processes as MAC_BIBA_TYPE_EQUAL so that they can ==== //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#23 (text+ko) ==== @@ -277,6 +277,7 @@ labelto->m_mls.mm_flags |= MAC_MLS_FLAG_SINGLE; } +#if 0 static void mac_mls_copy_range(struct mac *labelfrom, struct mac *labelto) { @@ -287,6 +288,7 @@ sizeof(labelto->m_mls.mm_rangehigh)); labelto->m_mls.mm_flags |= MAC_MLS_FLAG_RANGE; } +#endif /* * Initialize system processes as MAC_MLS_TYPE_EQUAL so that they can 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?200204171845.g3HIjGG49156>