On 09/22/2016 10:43 AM, Jason Zaman wrote:
> The file will initially contain:
> run_init=run_init_t
> There can not be any spaces around the = since OpenRC's existing config
> files and the methods it uses require it.
>
> Signed-off-by: Jason Zaman <jason@xxxxxxxxxxxxx>
Thanks, applied. I think however that we can dispense with a bunch of
these hidden_def/hidden_proto declarations; they are only needed for
exported functions that are also called internally by libselinux. Seems
like that is wrong for several of these functions.
> ---
> libselinux/include/selinux/selinux.h | 1 +
> libselinux/src/file_path_suffixes.h | 1 +
> libselinux/src/selinux_config.c | 10 +++++++++-
> libselinux/src/selinux_internal.h | 1 +
> 4 files changed, 12 insertions(+), 1 deletion(-)
>
> diff --git a/libselinux/include/selinux/selinux.h b/libselinux/include/selinux/selinux.h
> index 3d8673f..45dd6ca 100644
> --- a/libselinux/include/selinux/selinux.h
> +++ b/libselinux/include/selinux/selinux.h
> @@ -543,6 +543,7 @@ extern const char *selinux_virtual_image_context_path(void);
> extern const char *selinux_lxc_contexts_path(void);
> extern const char *selinux_x_context_path(void);
> extern const char *selinux_sepgsql_context_path(void);
> +extern const char *selinux_openrc_contexts_path(void);
> extern const char *selinux_openssh_contexts_path(void);
> extern const char *selinux_snapperd_contexts_path(void);
> extern const char *selinux_systemd_contexts_path(void);
> diff --git a/libselinux/src/file_path_suffixes.h b/libselinux/src/file_path_suffixes.h
> index 95b228b..2d3ca49 100644
> --- a/libselinux/src/file_path_suffixes.h
> +++ b/libselinux/src/file_path_suffixes.h
> @@ -23,6 +23,7 @@ S_(BINPOLICY, "/policy/policy")
> S_(VIRTUAL_DOMAIN, "/contexts/virtual_domain_context")
> S_(VIRTUAL_IMAGE, "/contexts/virtual_image_context")
> S_(LXC_CONTEXTS, "/contexts/lxc_contexts")
> + S_(OPENRC_CONTEXTS, "/contexts/openrc_contexts")
> S_(OPENSSH_CONTEXTS, "/contexts/openssh_contexts")
> S_(SNAPPERD_CONTEXTS, "/contexts/snapperd_contexts")
> S_(SYSTEMD_CONTEXTS, "/contexts/systemd_contexts")
> diff --git a/libselinux/src/selinux_config.c b/libselinux/src/selinux_config.c
> index c519a77..88bcc85 100644
> --- a/libselinux/src/selinux_config.c
> +++ b/libselinux/src/selinux_config.c
> @@ -51,7 +51,8 @@
> #define OPENSSH_CONTEXTS 28
> #define SYSTEMD_CONTEXTS 29
> #define SNAPPERD_CONTEXTS 30
> -#define NEL 31
> +#define OPENRC_CONTEXTS 31
> +#define NEL 32
>
> /* Part of one-time lazy init */
> static pthread_once_t once = PTHREAD_ONCE_INIT;
> @@ -493,6 +494,13 @@ const char *selinux_lxc_contexts_path(void)
>
> hidden_def(selinux_lxc_contexts_path)
>
> +const char *selinux_openrc_contexts_path(void)
> +{
> + return get_path(OPENRC_CONTEXTS);
> +}
> +
> +hidden_def(selinux_openrc_contexts_path)
> +
> const char *selinux_openssh_contexts_path(void)
> {
> return get_path(OPENSSH_CONTEXTS);
> diff --git a/libselinux/src/selinux_internal.h b/libselinux/src/selinux_internal.h
> index 9b9145c..3d5c9fb 100644
> --- a/libselinux/src/selinux_internal.h
> +++ b/libselinux/src/selinux_internal.h
> @@ -83,6 +83,7 @@ hidden_proto(selinux_mkload_policy)
> hidden_proto(selinux_media_context_path)
> hidden_proto(selinux_x_context_path)
> hidden_proto(selinux_sepgsql_context_path)
> + hidden_proto(selinux_openrc_contexts_path)
> hidden_proto(selinux_openssh_contexts_path)
> hidden_proto(selinux_snapperd_contexts_path)
> hidden_proto(selinux_systemd_contexts_path)
>
_______________________________________________
Selinux mailing list
Selinux@xxxxxxxxxxxxx
To unsubscribe, send email to Selinux-leave@xxxxxxxxxxxxx.
To get help, send an email containing "help" to Selinux-request@xxxxxxxxxxxxx.
