selinux-refpolicy.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [refpolicy] [PATCH] sysnetwork: put systemd_read_resolved_runtime in an ifdef
@ 2018-04-25  4:03 Jason Zaman
  2018-04-25 21:30 ` Chris PeBenito
  0 siblings, 1 reply; 2+ messages in thread
From: Jason Zaman @ 2018-04-25  4:03 UTC (permalink / raw)
  To: refpolicy

commit f865919872a2d709d37f3df7032a6ea73bdd8080
(Interface to read /run/systemd/resolve/resolv.conf)
Added an interface to sysnet_read_config which requires the systemd
module loaded. Putting the interface in an optional_policy() is not
possible since sysnet_read_config is called from several tunables so
we use an ifdef.
---
 policy/modules/system/sysnetwork.if | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/policy/modules/system/sysnetwork.if b/policy/modules/system/sysnetwork.if
index 1f7cf460..e6e4246d 100644
--- a/policy/modules/system/sysnetwork.if
+++ b/policy/modules/system/sysnetwork.if
@@ -348,7 +348,9 @@ interface(`sysnet_read_config',`
 	files_search_etc($1)
 	allow $1 net_conf_t:file read_file_perms;
 
-	systemd_read_resolved_runtime($1)
+	ifdef(`init_systemd',`
+		systemd_read_resolved_runtime($1)
+	')
 
 	ifdef(`distro_debian',`
 		files_search_pids($1)
-- 
2.16.1

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* [refpolicy] [PATCH] sysnetwork: put systemd_read_resolved_runtime in an ifdef
  2018-04-25  4:03 [refpolicy] [PATCH] sysnetwork: put systemd_read_resolved_runtime in an ifdef Jason Zaman
@ 2018-04-25 21:30 ` Chris PeBenito
  0 siblings, 0 replies; 2+ messages in thread
From: Chris PeBenito @ 2018-04-25 21:30 UTC (permalink / raw)
  To: refpolicy

On 04/25/2018 12:03 AM, Jason Zaman wrote:
> commit f865919872a2d709d37f3df7032a6ea73bdd8080
> (Interface to read /run/systemd/resolve/resolv.conf)
> Added an interface to sysnet_read_config which requires the systemd
> module loaded. Putting the interface in an optional_policy() is not
> possible since sysnet_read_config is called from several tunables so
> we use an ifdef.
> ---
>   policy/modules/system/sysnetwork.if | 4 +++-
>   1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/policy/modules/system/sysnetwork.if b/policy/modules/system/sysnetwork.if
> index 1f7cf460..e6e4246d 100644
> --- a/policy/modules/system/sysnetwork.if
> +++ b/policy/modules/system/sysnetwork.if
> @@ -348,7 +348,9 @@ interface(`sysnet_read_config',`
>   	files_search_etc($1)
>   	allow $1 net_conf_t:file read_file_perms;
>   
> -	systemd_read_resolved_runtime($1)
> +	ifdef(`init_systemd',`
> +		systemd_read_resolved_runtime($1)
> +	')
>   
>   	ifdef(`distro_debian',`
>   		files_search_pids($1)

Merged.

-- 
Chris PeBenito

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2018-04-25 21:30 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-04-25  4:03 [refpolicy] [PATCH] sysnetwork: put systemd_read_resolved_runtime in an ifdef Jason Zaman
2018-04-25 21:30 ` Chris PeBenito

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).