Date: Tue, 15 Aug 2006 18:21:14 GMT From: Todd Miller <millert@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 104085 for review Message-ID: <200608151821.k7FILEsd040559@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=104085 Change 104085 by millert@millert_macbook on 2006/08/15 18:20:43 Update to libsepol 1.12.23 Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/ChangeLog#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/Makefile#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/VERSION#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/include/sepol/boolean_record.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/include/sepol/booleans.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/include/sepol/context.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/include/sepol/context_record.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/include/sepol/debug.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/include/sepol/iface_record.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/include/sepol/interfaces.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/include/sepol/module.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/include/sepol/node_record.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/include/sepol/nodes.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/include/sepol/policydb.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/include/sepol/policydb/avrule_block.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/include/sepol/policydb/avtab.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/include/sepol/policydb/conditional.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/include/sepol/policydb/constraint.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/include/sepol/policydb/context.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/include/sepol/policydb/ebitmap.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/include/sepol/policydb/expand.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/include/sepol/policydb/flask_types.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/include/sepol/policydb/hashtab.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/include/sepol/policydb/hierarchy.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/include/sepol/policydb/link.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/include/sepol/policydb/mls_types.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/include/sepol/policydb/module.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/include/sepol/policydb/policydb.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/include/sepol/policydb/services.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/include/sepol/policydb/sidtab.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/include/sepol/policydb/symtab.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/include/sepol/policydb/util.h#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/include/sepol/port_record.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/include/sepol/ports.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/include/sepol/roles.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/include/sepol/sepol.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/include/sepol/user_record.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/include/sepol/users.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/src/Makefile#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/src/assertion.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/src/avrule_block.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/src/avtab.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/src/boolean_internal.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/src/boolean_record.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/src/booleans.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/src/conditional.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/src/constraint.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/src/context.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/src/context.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/src/context_internal.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/src/context_record.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/src/debug.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/src/debug.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/src/ebitmap.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/src/expand.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/src/genbools.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/src/genusers.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/src/handle.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/src/handle.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/src/hashtab.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/src/hierarchy.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/src/iface_internal.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/src/iface_record.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/src/interfaces.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/src/link.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/src/mls.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/src/mls.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/src/module.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/src/module_internal.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/src/node_internal.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/src/node_record.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/src/nodes.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/src/policydb.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/src/policydb_convert.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/src/policydb_internal.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/src/policydb_public.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/src/port_internal.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/src/port_record.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/src/ports.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/src/private.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/src/roles.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/src/services.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/src/sidtab.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/src/symtab.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/src/user_internal.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/src/user_record.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/src/users.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/src/util.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/src/write.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/tests/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/tests/libsepol-tests.c#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/tests/policies/refpolicy-base.conf#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/tests/test-cond.c#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/tests/test-cond.h#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/utils/chkcon.c#2 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/ChangeLog#2 (text+ko) ==== @@ -1,3 +1,69 @@ +1.12.23 2006-08-03 + * Merged symtab datum patch from Karl MacMillan. + +1.12.22 2006-08-03 + * Merged netfilter contexts support from Chris PeBenito. + +1.12.21 2006-07-28 + * Merged helpful hierarchy check errors patch from Joshua Brindle. + +1.12.20 2006-07-25 + * Merged semodule_deps patch from Karl MacMillan. + This adds source module names to the avrule decls. + +1.12.19 2006-06-29 + * Lindent. + +1.12.18 2006-06-26 + * Merged optionals in base take 2 patch set from Joshua Brindle. + +1.12.17 2006-05-30 + * Revert 1.12.16. + +1.12.16 2006-05-30 + * Merged cleaner fix for bool_ids overflow from Karl MacMillan, + replacing the prior patch. + +1.12.15 2006-05-30 + * Merged fixes for several memory leaks in the error paths during + policy read from Serge Hallyn. + +1.12.14 2006-05-25 + * Fixed bool_ids overflow bug in cond_node_find and cond_copy_list, + based on bug report and suggested fix by Cedric Roux. + +1.12.13 2006-05-24 + * Merged sens_copy_callback, check_role_hierarchy_callback, + and node_from_record fixes from Serge Hallyn. + +1.12.12 2006-05-22 + * Added sepol_policydb_compat_net() interface for testing whether + a policy requires the compatibility support for network checks + to be enabled in the kernel. + +1.12.11 2006-05-17 + * Merged patch to initialize sym_val_to_name arrays from Kevin Carr. + Reworked to use calloc in the first place, and converted some other + malloc/memset pairs to calloc calls. + +1.12.10 2006-05-08 + * Merged patch to revert role/user decl upgrade from Karl MacMillan. + +1.12.9 2006-05-08 + * Dropped tests from all Makefile target. + +1.12.8 2006-05-05 + * Merged fix warnings patch from Karl MacMillan. + +1.12.7 2006-05-05 + * Merged libsepol test framework patch from Karl MacMillan. + +1.12.6 2006-04-28 + * Fixed cond_normalize to traverse the entire cond list at link time. + +1.12.5 2006-04-03 + * Merged fix for leak of optional package sections from Ivan Gyurdiev. + 1.12.4 2006-03-29 * Generalize test for bitmap overflow in ebitmap_set_bit. ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/Makefile#2 (text+ko) ==== @@ -14,4 +14,8 @@ clean: $(MAKE) -C src clean $(MAKE) -C utils clean + $(MAKE) -C tests clean + +test: + $(MAKE) -C tests test ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/VERSION#2 (text+ko) ==== @@ -1,1 +1,1 @@ -1.12.4 +1.12.23 ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/include/sepol/boolean_record.h#2 (text+ko) ==== @@ -10,59 +10,42 @@ typedef struct sepol_bool_key sepol_bool_key_t; /* Key */ -extern int sepol_bool_key_create( - sepol_handle_t* handle, - const char* name, - sepol_bool_key_t** key); +extern int sepol_bool_key_create(sepol_handle_t * handle, + const char *name, sepol_bool_key_t ** key); + +extern void sepol_bool_key_unpack(const sepol_bool_key_t * key, + const char **name); -extern void sepol_bool_key_unpack( - const sepol_bool_key_t* key, - const char** name); +extern int sepol_bool_key_extract(sepol_handle_t * handle, + const sepol_bool_t * boolean, + sepol_bool_key_t ** key_ptr); -extern int sepol_bool_key_extract( - sepol_handle_t* handle, - const sepol_bool_t* boolean, - sepol_bool_key_t** key_ptr); +extern void sepol_bool_key_free(sepol_bool_key_t * key); -extern void sepol_bool_key_free( - sepol_bool_key_t* key); +extern int sepol_bool_compare(const sepol_bool_t * boolean, + const sepol_bool_key_t * key); -extern int sepol_bool_compare( - const sepol_bool_t* boolean, - const sepol_bool_key_t* key); +extern int sepol_bool_compare2(const sepol_bool_t * boolean, + const sepol_bool_t * boolean2); -extern int sepol_bool_compare2( - const sepol_bool_t* boolean, - const sepol_bool_t* boolean2); - /* Name */ -extern const char* sepol_bool_get_name( - const sepol_bool_t* boolean); +extern const char *sepol_bool_get_name(const sepol_bool_t * boolean); -extern int sepol_bool_set_name( - sepol_handle_t* handle, - sepol_bool_t* boolean, - const char* name); +extern int sepol_bool_set_name(sepol_handle_t * handle, + sepol_bool_t * boolean, const char *name); /* Value */ -extern int sepol_bool_get_value( - const sepol_bool_t* boolean); +extern int sepol_bool_get_value(const sepol_bool_t * boolean); -extern void sepol_bool_set_value( - sepol_bool_t* boolean, - int value); +extern void sepol_bool_set_value(sepol_bool_t * boolean, int value); /* Create/Clone/Destroy */ -extern int sepol_bool_create( - sepol_handle_t* handle, - sepol_bool_t** bool_ptr); +extern int sepol_bool_create(sepol_handle_t * handle, sepol_bool_t ** bool_ptr); -extern int sepol_bool_clone( - sepol_handle_t* handle, - const sepol_bool_t* boolean, - sepol_bool_t** bool_ptr); +extern int sepol_bool_clone(sepol_handle_t * handle, + const sepol_bool_t * boolean, + sepol_bool_t ** bool_ptr); -extern void sepol_bool_free( - sepol_bool_t* boolean); +extern void sepol_bool_free(sepol_bool_t * boolean); #endif ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/include/sepol/booleans.h#2 (text+ko) ==== @@ -13,47 +13,37 @@ policy for the boolean settings in the boolean configuration file. The binary policy is rewritten in place in memory. Returns 0 upon success, or -1 otherwise. */ -extern int sepol_genbools( - void *data, size_t len, - char *boolpath); +extern int sepol_genbools(void *data, size_t len, char *boolpath); /* Given an existing binary policy (starting at 'data', with length 'len') and boolean settings specified by the parallel arrays ('names', 'values') with 'nel' elements, rewrite the binary policy for the boolean settings. The binary policy is rewritten in place in memory. Returns 0 upon success or -1 otherwise. */ -extern int sepol_genbools_array( - void *data, size_t len, - char **names, int *values, - int nel); +extern int sepol_genbools_array(void *data, size_t len, + char **names, int *values, int nel); /*---------------end compatbility------------*/ /* Set the specified boolean */ -extern int sepol_bool_set ( - sepol_handle_t* handle, - sepol_policydb_t* policydb, - const sepol_bool_key_t* key, - const sepol_bool_t* data); +extern int sepol_bool_set(sepol_handle_t * handle, + sepol_policydb_t * policydb, + const sepol_bool_key_t * key, + const sepol_bool_t * data); /* Return the number of booleans */ -extern int sepol_bool_count( - sepol_handle_t* handle, - const sepol_policydb_t* p, - unsigned int* response); +extern int sepol_bool_count(sepol_handle_t * handle, + const sepol_policydb_t * p, unsigned int *response); /* Check if the specified boolean exists */ -extern int sepol_bool_exists( - sepol_handle_t* handle, - const sepol_policydb_t* policydb, - const sepol_bool_key_t* key, - int* response); +extern int sepol_bool_exists(sepol_handle_t * handle, + const sepol_policydb_t * policydb, + const sepol_bool_key_t * key, int *response); /* Query a boolean - returns the boolean, or NULL if not found */ -extern int sepol_bool_query( - sepol_handle_t* handle, - const sepol_policydb_t* p, - const sepol_bool_key_t* key, - sepol_bool_t** response); +extern int sepol_bool_query(sepol_handle_t * handle, + const sepol_policydb_t * p, + const sepol_bool_key_t * key, + sepol_bool_t ** response); /* Iterate the booleans * The handler may return: @@ -61,12 +51,9 @@ * 1 to signal successful exit * 0 to signal continue */ -extern int sepol_bool_iterate( - sepol_handle_t* handle, - const sepol_policydb_t* policydb, - int (*fn)( - const sepol_bool_t* boolean, - void* fn_arg), - void* arg); +extern int sepol_bool_iterate(sepol_handle_t * handle, + const sepol_policydb_t * policydb, + int (*fn) (const sepol_bool_t * boolean, + void *fn_arg), void *arg); #endif ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/include/sepol/context.h#2 (text+ko) ==== @@ -7,25 +7,19 @@ /* -- Deprecated -- */ -extern int sepol_check_context( - const char *context); +extern int sepol_check_context(const char *context); /* -- End deprecated -- */ -extern int sepol_context_check( - sepol_handle_t* handle, - const sepol_policydb_t* policydb, - const sepol_context_t* context); +extern int sepol_context_check(sepol_handle_t * handle, + const sepol_policydb_t * policydb, + const sepol_context_t * context); -extern int sepol_mls_contains( - sepol_handle_t* handle, - const sepol_policydb_t* policydb, - const char* mls1, - const char* mls2, - int* response); +extern int sepol_mls_contains(sepol_handle_t * handle, + const sepol_policydb_t * policydb, + const char *mls1, + const char *mls2, int *response); -extern int sepol_mls_check( - sepol_handle_t* handle, - const sepol_policydb_t* policydb, - const char* mls); +extern int sepol_mls_check(sepol_handle_t * handle, + const sepol_policydb_t * policydb, const char *mls); #endif ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/include/sepol/context_record.h#2 (text+ko) ==== @@ -1,5 +1,5 @@ #ifndef _SEPOL_CONTEXT_RECORD_H_ -#define _SEPOL_CONTEXT_RECORD_H_ +#define _SEPOL_CONTEXT_RECORD_H_ #include <sepol/handle.h> @@ -10,63 +10,44 @@ * in a data collection by itself */ /* User */ -extern const char* sepol_context_get_user( - const sepol_context_t* con); +extern const char *sepol_context_get_user(const sepol_context_t * con); -extern int sepol_context_set_user( - sepol_handle_t* handle, - sepol_context_t* con, - const char* user); +extern int sepol_context_set_user(sepol_handle_t * handle, + sepol_context_t * con, const char *user); /* Role */ -extern const char* sepol_context_get_role( - const sepol_context_t* con); +extern const char *sepol_context_get_role(const sepol_context_t * con); -extern int sepol_context_set_role( - sepol_handle_t* handle, - sepol_context_t* con, - const char* role); +extern int sepol_context_set_role(sepol_handle_t * handle, + sepol_context_t * con, const char *role); /* Type */ -extern const char* sepol_context_get_type( - const sepol_context_t* con); +extern const char *sepol_context_get_type(const sepol_context_t * con); -extern int sepol_context_set_type( - sepol_handle_t* handle, - sepol_context_t* con, - const char* type); +extern int sepol_context_set_type(sepol_handle_t * handle, + sepol_context_t * con, const char *type); /* MLS */ -extern const char* sepol_context_get_mls( - const sepol_context_t* con); +extern const char *sepol_context_get_mls(const sepol_context_t * con); -extern int sepol_context_set_mls( - sepol_handle_t* handle, - sepol_context_t* con, - const char* mls_range); +extern int sepol_context_set_mls(sepol_handle_t * handle, + sepol_context_t * con, const char *mls_range); /* Create/Clone/Destroy */ -extern int sepol_context_create( - sepol_handle_t* handle, - sepol_context_t** con_ptr); +extern int sepol_context_create(sepol_handle_t * handle, + sepol_context_t ** con_ptr); -extern int sepol_context_clone( - sepol_handle_t* handle, - const sepol_context_t* con, - sepol_context_t** con_ptr); +extern int sepol_context_clone(sepol_handle_t * handle, + const sepol_context_t * con, + sepol_context_t ** con_ptr); -extern void sepol_context_free( - sepol_context_t* con); +extern void sepol_context_free(sepol_context_t * con); /* Parse to/from string */ -extern int sepol_context_from_string( - sepol_handle_t* handle, - const char* str, - sepol_context_t** con); +extern int sepol_context_from_string(sepol_handle_t * handle, + const char *str, sepol_context_t ** con); -extern int sepol_context_to_string( - sepol_handle_t* handle, - const sepol_context_t* con, - char** str_ptr); +extern int sepol_context_to_string(sepol_handle_t * handle, + const sepol_context_t * con, char **str_ptr); -#endif +#endif ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/include/sepol/debug.h#2 (text+ko) ==== @@ -11,29 +11,24 @@ #define SEPOL_MSG_WARN 2 #define SEPOL_MSG_INFO 3 -extern int sepol_msg_get_level( - sepol_handle_t* handle); +extern int sepol_msg_get_level(sepol_handle_t * handle); -extern const char* sepol_msg_get_channel( - sepol_handle_t* handle); +extern const char *sepol_msg_get_channel(sepol_handle_t * handle); -extern const char* sepol_msg_get_fname( - sepol_handle_t* handle); +extern const char *sepol_msg_get_fname(sepol_handle_t * handle); /* Set the messaging callback. * By the default, the callback will print * the message on standard output, in a * particular format. Passing NULL here * indicates that messaging should be suppressed */ -extern void sepol_msg_set_callback( - sepol_handle_t* handle, +extern void sepol_msg_set_callback(sepol_handle_t * handle, #ifdef __GNUC__ - __attribute__ ((format (printf, 3, 4))) + __attribute__ ((format(printf, 3, 4))) +#endif + void (*msg_callback) (void *varg, + sepol_handle_t * + handle, + const char *fmt, ...), + void *msg_callback_arg); #endif - void (*msg_callback) ( - void* varg, - sepol_handle_t* handle, - const char* fmt, - ...), - void* msg_callback_arg); -#endif ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/include/sepol/iface_record.h#2 (text+ko) ==== @@ -1,5 +1,5 @@ #ifndef _SEPOL_IFACE_RECORD_H_ -#define _SEPOL_IFACE_RECORD_H_ +#define _SEPOL_IFACE_RECORD_H_ #include <sepol/handle.h> #include <sepol/context_record.h> @@ -10,68 +10,50 @@ typedef struct sepol_iface_key sepol_iface_key_t; /* Key */ -extern int sepol_iface_compare( - const sepol_iface_t* iface, - const sepol_iface_key_t* key); +extern int sepol_iface_compare(const sepol_iface_t * iface, + const sepol_iface_key_t * key); -extern int sepol_iface_compare2( - const sepol_iface_t* iface, - const sepol_iface_t* iface2); +extern int sepol_iface_compare2(const sepol_iface_t * iface, + const sepol_iface_t * iface2); -extern void sepol_iface_key_unpack( - const sepol_iface_key_t* key, - const char** name); +extern void sepol_iface_key_unpack(const sepol_iface_key_t * key, + const char **name); -extern int sepol_iface_key_create( - sepol_handle_t* handle, - const char* name, - sepol_iface_key_t** key_ptr); +extern int sepol_iface_key_create(sepol_handle_t * handle, + const char *name, + sepol_iface_key_t ** key_ptr); -extern int sepol_iface_key_extract( - sepol_handle_t* handle, - const sepol_iface_t* iface, - sepol_iface_key_t** key_ptr); +extern int sepol_iface_key_extract(sepol_handle_t * handle, + const sepol_iface_t * iface, + sepol_iface_key_t ** key_ptr); -extern void sepol_iface_key_free( - sepol_iface_key_t* key); +extern void sepol_iface_key_free(sepol_iface_key_t * key); /* Name */ -extern const char* sepol_iface_get_name( - const sepol_iface_t* iface); +extern const char *sepol_iface_get_name(const sepol_iface_t * iface); -extern int sepol_iface_set_name( - sepol_handle_t* handle, - sepol_iface_t* iface, - const char* name); +extern int sepol_iface_set_name(sepol_handle_t * handle, + sepol_iface_t * iface, const char *name); /* Context */ -extern sepol_context_t* sepol_iface_get_ifcon( - const sepol_iface_t* iface); +extern sepol_context_t *sepol_iface_get_ifcon(const sepol_iface_t * iface); -extern int sepol_iface_set_ifcon( - sepol_handle_t* handle, - sepol_iface_t* iface, - sepol_context_t* con); +extern int sepol_iface_set_ifcon(sepol_handle_t * handle, + sepol_iface_t * iface, sepol_context_t * con); -extern sepol_context_t* sepol_iface_get_msgcon( - const sepol_iface_t* iface); +extern sepol_context_t *sepol_iface_get_msgcon(const sepol_iface_t * iface); -extern int sepol_iface_set_msgcon( - sepol_handle_t* handle, - sepol_iface_t* iface, - sepol_context_t* con); +extern int sepol_iface_set_msgcon(sepol_handle_t * handle, + sepol_iface_t * iface, sepol_context_t * con); /* Create/Clone/Destroy */ -extern int sepol_iface_create( - sepol_handle_t* handle, - sepol_iface_t** iface_ptr); +extern int sepol_iface_create(sepol_handle_t * handle, + sepol_iface_t ** iface_ptr); -extern int sepol_iface_clone( - sepol_handle_t* handle, - const sepol_iface_t* iface, - sepol_iface_t** iface_ptr); +extern int sepol_iface_clone(sepol_handle_t * handle, + const sepol_iface_t * iface, + sepol_iface_t ** iface_ptr); -extern void sepol_iface_free( - sepol_iface_t* iface); +extern void sepol_iface_free(sepol_iface_t * iface); #endif ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/include/sepol/interfaces.h#2 (text+ko) ==== @@ -6,33 +6,28 @@ #include <sepol/handle.h> /* Return the number of interfaces */ -extern int sepol_iface_count( - sepol_handle_t* handle, - const sepol_policydb_t* policydb, - unsigned int* response); +extern int sepol_iface_count(sepol_handle_t * handle, + const sepol_policydb_t * policydb, + unsigned int *response); /* Check if an interface exists */ -extern int sepol_iface_exists( - sepol_handle_t* handle, - const sepol_policydb_t* policydb, - const sepol_iface_key_t* key, - int* response); +extern int sepol_iface_exists(sepol_handle_t * handle, + const sepol_policydb_t * policydb, + const sepol_iface_key_t * key, int *response); /* Query an interface - returns the interface, * or NULL if not found */ -extern int sepol_iface_query( - sepol_handle_t* handle, - const sepol_policydb_t* policydb, - const sepol_iface_key_t* key, - sepol_iface_t** response); +extern int sepol_iface_query(sepol_handle_t * handle, + const sepol_policydb_t * policydb, + const sepol_iface_key_t * key, + sepol_iface_t ** response); /* Modify an interface, or add it, if the key * is not found */ -extern int sepol_iface_modify( - sepol_handle_t* handle, - sepol_policydb_t* policydb, - const sepol_iface_key_t* key, - const sepol_iface_t* data); +extern int sepol_iface_modify(sepol_handle_t * handle, + sepol_policydb_t * policydb, + const sepol_iface_key_t * key, + const sepol_iface_t * data); /* Iterate the interfaces * The handler may return: @@ -40,12 +35,9 @@ * 1 to signal successful exit * 0 to signal continue */ -extern int sepol_iface_iterate( - sepol_handle_t* handle, - const sepol_policydb_t* policydb, - int (*fn)( - const sepol_iface_t* iface, - void* fn_arg), - void* arg); +extern int sepol_iface_iterate(sepol_handle_t * handle, + const sepol_policydb_t * policydb, + int (*fn) (const sepol_iface_t * iface, + void *fn_arg), void *arg); #endif ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/include/sepol/module.h#2 (text+ko) ==== @@ -6,73 +6,77 @@ #include <stdint.h> #include <sepol/handle.h> -#include <sepol/policydb.h> +#include <sepol/policydb.h> struct sepol_module_package; typedef struct sepol_module_package sepol_module_package_t; /* Module package public interfaces. */ -extern int sepol_module_package_create(sepol_module_package_t **p); +extern int sepol_module_package_create(sepol_module_package_t ** p); + +extern void sepol_module_package_free(sepol_module_package_t * p); + +extern char *sepol_module_package_get_file_contexts(sepol_module_package_t * p); -extern void sepol_module_package_free(sepol_module_package_t *p); +extern size_t sepol_module_package_get_file_contexts_len(sepol_module_package_t + * p); -extern char *sepol_module_package_get_file_contexts(sepol_module_package_t *p); +extern int sepol_module_package_set_file_contexts(sepol_module_package_t * p, + char *data, size_t len); -extern size_t sepol_module_package_get_file_contexts_len(sepol_module_package_t *p); +extern char *sepol_module_package_get_seusers(sepol_module_package_t * p); -extern int sepol_module_package_set_file_contexts(sepol_module_package_t *p, - char *data, - size_t len); +extern size_t sepol_module_package_get_seusers_len(sepol_module_package_t * p); -extern char *sepol_module_package_get_seusers(sepol_module_package_t *p); +extern int sepol_module_package_set_seusers(sepol_module_package_t * p, + char *data, size_t len); -extern size_t sepol_module_package_get_seusers_len(sepol_module_package_t *p); +extern char *sepol_module_package_get_user_extra(sepol_module_package_t * p); -extern int sepol_module_package_set_seusers(sepol_module_package_t *p, - char *data, - size_t len); +extern size_t sepol_module_package_get_user_extra_len(sepol_module_package_t * + p); -extern char *sepol_module_package_get_user_extra(sepol_module_package_t *p); +extern int sepol_module_package_set_user_extra(sepol_module_package_t * p, + char *data, size_t len); -extern size_t sepol_module_package_get_user_extra_len(sepol_module_package_t *p); +extern char *sepol_module_package_get_netfilter_contexts(sepol_module_package_t + * p); -extern int sepol_module_package_set_user_extra(sepol_module_package_t *p, - char *data, - size_t len); +extern size_t +sepol_module_package_get_netfilter_contexts_len(sepol_module_package_t * p); +extern int sepol_module_package_set_netfilter_contexts(sepol_module_package_t * + p, char *data, + size_t len); -extern sepol_policydb_t *sepol_module_package_get_policy(sepol_module_package_t *p); +extern sepol_policydb_t *sepol_module_package_get_policy(sepol_module_package_t + * p); -extern int sepol_link_packages(sepol_handle_t *handle, - sepol_module_package_t *base, - sepol_module_package_t **modules, - int num_modules, - int verbose); +extern int sepol_link_packages(sepol_handle_t * handle, + sepol_module_package_t * base, + sepol_module_package_t ** modules, + int num_modules, int verbose); -extern int sepol_module_package_read(sepol_module_package_t *mod, - struct sepol_policy_file *file, +extern int sepol_module_package_read(sepol_module_package_t * mod, + struct sepol_policy_file *file, int verbose); -extern int sepol_module_package_info(struct sepol_policy_file *file, +extern int sepol_module_package_info(struct sepol_policy_file *file, int *type, char **name, char **version); -extern int sepol_module_package_write(sepol_module_package_t *p, +extern int sepol_module_package_write(sepol_module_package_t * p, struct sepol_policy_file *file); /* Module linking/expanding public interfaces. */ -extern int sepol_link_modules(sepol_handle_t *handle, - sepol_policydb_t *base, - sepol_policydb_t **modules, - size_t len, - int verbose); +extern int sepol_link_modules(sepol_handle_t * handle, + sepol_policydb_t * base, + sepol_policydb_t ** modules, + size_t len, int verbose); -extern int sepol_expand_module(sepol_handle_t *handle, - sepol_policydb_t *base, - sepol_policydb_t *out, - int verbose, - int check); +extern int sepol_expand_module(sepol_handle_t * handle, + sepol_policydb_t * base, + sepol_policydb_t * out, int verbose, int check); #endif - ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/include/sepol/node_record.h#2 (text+ko) ==== @@ -1,5 +1,5 @@ #ifndef _SEPOL_NODE_RECORD_H_ -#define _SEPOL_NODE_RECORD_H_ +#define _SEPOL_NODE_RECORD_H_ #include <stddef.h> #include <sepol/context_record.h> @@ -14,114 +14,79 @@ #define SEPOL_PROTO_IP6 1 /* Key */ -extern int sepol_node_compare( - const sepol_node_t* node, - const sepol_node_key_t* key); +extern int sepol_node_compare(const sepol_node_t * node, + const sepol_node_key_t * key); -extern int sepol_node_compare2( - const sepol_node_t* node, - const sepol_node_t* node2); +extern int sepol_node_compare2(const sepol_node_t * node, + const sepol_node_t * node2); -extern int sepol_node_key_create( - sepol_handle_t* handle, - const char* addr, - const char* mask, - int proto, - sepol_node_key_t** key_ptr); +extern int sepol_node_key_create(sepol_handle_t * handle, + const char *addr, + const char *mask, + int proto, sepol_node_key_t ** key_ptr); -extern void sepol_node_key_unpack( - const sepol_node_key_t* key, - const char** addr, - const char** mask, - int* proto); +extern void sepol_node_key_unpack(const sepol_node_key_t * key, + const char **addr, + const char **mask, int *proto); -extern int sepol_node_key_extract( - sepol_handle_t* handle, - const sepol_node_t* node, - sepol_node_key_t** key_ptr); +extern int sepol_node_key_extract(sepol_handle_t * handle, + const sepol_node_t * node, + sepol_node_key_t ** key_ptr); -extern void sepol_node_key_free( - sepol_node_key_t* key); +extern void sepol_node_key_free(sepol_node_key_t * key); /* Address */ -extern int sepol_node_get_addr( - sepol_handle_t* handle, - const sepol_node_t* node, - char** addr); +extern int sepol_node_get_addr(sepol_handle_t * handle, + const sepol_node_t * node, char **addr); -extern int sepol_node_get_addr_bytes( - sepol_handle_t* handle, - const sepol_node_t* node, - char** addr, - size_t* addr_sz); +extern int sepol_node_get_addr_bytes(sepol_handle_t * handle, + const sepol_node_t * node, + char **addr, size_t * addr_sz); -extern int sepol_node_set_addr( - sepol_handle_t* handle, - sepol_node_t* node, - int proto, - const char* addr); +extern int sepol_node_set_addr(sepol_handle_t * handle, + sepol_node_t * node, + int proto, const char *addr); -extern int sepol_node_set_addr_bytes( - sepol_handle_t* handle, - sepol_node_t* node, - const char* addr, - size_t addr_sz); +extern int sepol_node_set_addr_bytes(sepol_handle_t * handle, + sepol_node_t * node, + const char *addr, size_t addr_sz); /* Netmask */ -extern int sepol_node_get_mask( - sepol_handle_t* handle, - const sepol_node_t* node, - char** mask); +extern int sepol_node_get_mask(sepol_handle_t * handle, + const sepol_node_t * node, char **mask); -extern int sepol_node_get_mask_bytes( - sepol_handle_t* handle, - const sepol_node_t* node, - char** mask, - size_t* mask_sz); +extern int sepol_node_get_mask_bytes(sepol_handle_t * handle, + const sepol_node_t * node, + char **mask, size_t * mask_sz); -extern int sepol_node_set_mask( - sepol_handle_t* handle, - sepol_node_t* node, - int proto, - const char* mask); +extern int sepol_node_set_mask(sepol_handle_t * handle, + sepol_node_t * node, + int proto, const char *mask); -extern int sepol_node_set_mask_bytes( - sepol_handle_t* handle, - sepol_node_t* node, - const char* mask, - size_t mask_sz); +extern int sepol_node_set_mask_bytes(sepol_handle_t * handle, + sepol_node_t * node, + const char *mask, size_t mask_sz); /* Protocol */ -extern int sepol_node_get_proto( - const sepol_node_t* node); +extern int sepol_node_get_proto(const sepol_node_t * node); -extern void sepol_node_set_proto( - sepol_node_t* node, - int proto); +extern void sepol_node_set_proto(sepol_node_t * node, int proto); -extern const char* sepol_node_get_proto_str( - int proto); +extern const char *sepol_node_get_proto_str(int proto); /* Context */ -extern sepol_context_t* sepol_node_get_con( - const sepol_node_t* node); +extern sepol_context_t *sepol_node_get_con(const sepol_node_t * node); -extern int sepol_node_set_con( - sepol_handle_t* handle, - sepol_node_t* node, - sepol_context_t* con); +extern int sepol_node_set_con(sepol_handle_t * handle, + sepol_node_t * node, sepol_context_t * con); /* Create/Clone/Destroy */ -extern int sepol_node_create( - sepol_handle_t* handle, - sepol_node_t** node_ptr); +extern int sepol_node_create(sepol_handle_t * handle, sepol_node_t ** node_ptr); -extern int sepol_node_clone( >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200608151821.k7FILEsd040559>