Skip to contentSkip to conversation

Make samba domtrans optional in virt

PATCH New Sven Vermeulen 2 participants 2 messages Nov 10, 2012 – Nov 14, 2012

lore
Share & tools
lore

Sven Vermeulen

author
#0 lore raw

PATCH 1/1 Make samba domtrans optional in virt

The virt module has a call to samba_domtrans_smbd which isn't marked as an optional_policy call. This made the module depend on samba module, which isn't always needed.

Signed-off-by Sven Vermeulen <[email protected]>
---
 virt.te |   18 ++++++++++--------
 1 files changed, 10 insertions(+), 8 deletions(-)
virt.te +10 -8
index f15cf2b..c11b54f 100644
@@ -305,14 +305,6 @@ tunable_policy(`virt_use_nfs',`
 	fs_read_nfs_symlinks(virt_domain)
 ')
 
-tunable_policy(`virt_use_samba',`
-	fs_manage_cifs_dirs(virt_domain)
-	fs_manage_cifs_files(virt_domain)
-	fs_manage_cifs_named_sockets(virt_domain)
-	fs_read_cifs_symlinks(virt_domain)
-	samba_domtrans_smbd(virt_domain)
-')
-
 tunable_policy(`virt_use_sysfs',`
 	dev_rw_sysfs(virt_domain)
 ')

@@ -325,6 +317,16 @@ tunable_policy(`virt_use_usb',`
 ')
 
 optional_policy(`
+	tunable_policy(`virt_use_samba',`
+		fs_manage_cifs_dirs(virt_domain)
+		fs_manage_cifs_files(virt_domain)
+		fs_manage_cifs_named_sockets(virt_domain)
+		fs_read_cifs_symlinks(virt_domain)
+		samba_domtrans_smbd(virt_domain)
+	')
+')
+
+optional_policy(`
 	tunable_policy(`virt_use_xserver',`
 		xserver_read_xdm_pid(virt_domain)
 		xserver_stream_connect(virt_domain)
Signature · 1 line
1.7.8.6
#1 lore raw

PATCH 1/1 Make samba domtrans optional in virt

Quoted 35 lines · Sven Vermeulen

The virt module has a call to samba_domtrans_smbd which isn't marked as an optional_policy call. This made the module depend on samba module, which isn't always needed.

Signed-off-by Sven Vermeulen <[email protected]>
---
 virt.te |   18 ++++++++++--------
 1 files changed, 10 insertions(+), 8 deletions(-)
virt.te +3 -8
index f15cf2b..c11b54f 100644
@@ -305,14 +305,6 @@ tunable_policy(`virt_use_nfs',`
 	fs_read_nfs_symlinks(virt_domain)
 ')
 
-tunable_policy(`virt_use_samba',`
-	fs_manage_cifs_dirs(virt_domain)
-	fs_manage_cifs_files(virt_domain)
-	fs_manage_cifs_named_sockets(virt_domain)
-	fs_read_cifs_symlinks(virt_domain)
-	samba_domtrans_smbd(virt_domain)
-')
-
 tunable_policy(`virt_use_sysfs',`
 	dev_rw_sysfs(virt_domain)
 ')

@@ -325,6 +317,16 @@ tunable_policy(`virt_use_usb',`
 ')
 
 optional_policy(`
+	tunable_policy(`virt_use_samba',`
+		fs_manage_cifs_dirs(virt_domain)
+		fs_manage_cifs_files(virt_domain)

virt.te tunable_policy(`virt_use_usb',` · line 332

Quoted 10 lines
virt.te +7 -0
+		fs_manage_cifs_named_sockets(virt_domain)
+		fs_read_cifs_symlinks(virt_domain)
+		samba_domtrans_smbd(virt_domain)
+	')
+')
+
+optional_policy(`
 	tunable_policy(`virt_use_xserver',`
 		xserver_read_xdm_pid(virt_domain)
 		xserver_stream_connect(virt_domain)

This was merged, thanks