security: Remove labelling of 'externalDataStore'

The feature was never completed and is not really being pursued. Remove
the storage driver integration.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>

diff --git a/src/security/security_dac.c b/src/security/security_dac.c
index 11fff63bc7349dc23507b4f31de32bb429a03615..bdc2d7edf33dc339c0dc9e168de0112f27e1ea82 100644 (file)
--- a/src/security/security_dac.c
+++ b/src/security/security_dac.c
@@ -983,14 +983,6 @@ virSecurityDACSetImageLabelRelative(virSecurityManagerPtr mgr,
         if (virSecurityDACSetImageLabelInternal(mgr, def, n, parent, isChainTop) < 0)
             return -1;
 
-        if (n->externalDataStore &&
-            virSecurityDACSetImageLabelRelative(mgr,
-                                                def,
-                                                n->externalDataStore,
-                                                parent,
-                                                flags) < 0)
-            return -1;
-
         if (!(flags & VIR_SECURITY_DOMAIN_IMAGE_LABEL_BACKING_CHAIN))
             break;
 
@@ -1090,13 +1082,6 @@ virSecurityDACRestoreImageLabelInt(virSecurityManagerPtr mgr,
     if (virSecurityDACRestoreImageLabelSingle(mgr, def, src, migrated) < 0)
         return -1;
 
-    if (src->externalDataStore &&
-        virSecurityDACRestoreImageLabelSingle(mgr,
-                                              def,
-                                              src->externalDataStore,
-                                              migrated) < 0)
-        return -1;
-
     return 0;
 }
 

diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c
index 281c303296ad254e4ff64d4a03ec84168bae5437..9a929debe116f881d2165705996ab5d71c4f5c55 100644 (file)
--- a/src/security/security_selinux.c
+++ b/src/security/security_selinux.c
@@ -1806,13 +1806,6 @@ virSecuritySELinuxRestoreImageLabelInt(virSecurityManagerPtr mgr,
     if (virSecuritySELinuxRestoreImageLabelSingle(mgr, def, src, migrated) < 0)
         return -1;
 
-    if (src->externalDataStore &&
-        virSecuritySELinuxRestoreImageLabelSingle(mgr,
-                                                  def,
-                                                  src->externalDataStore,
-                                                  migrated) < 0)
-        return -1;
-
     return 0;
 }
 
@@ -1880,7 +1873,7 @@ virSecuritySELinuxSetImageLabelInternal(virSecurityManagerPtr mgr,
             return 0;
 
         use_label = parent_seclabel->label;
-    } else if (parent == src || parent->externalDataStore == src) {
+    } else if (parent == src) {
         if (src->shared) {
             use_label = data->file_context;
         } else if (src->readonly) {
@@ -1942,14 +1935,6 @@ virSecuritySELinuxSetImageLabelRelative(virSecurityManagerPtr mgr,
         if (virSecuritySELinuxSetImageLabelInternal(mgr, def, n, parent, isChainTop) < 0)
             return -1;
 
-        if (n->externalDataStore &&
-            virSecuritySELinuxSetImageLabelRelative(mgr,
-                                                    def,
-                                                    n->externalDataStore,
-                                                    parent,
-                                                    flags) < 0)
-            return -1;
-
         if (!(flags & VIR_SECURITY_DOMAIN_IMAGE_LABEL_BACKING_CHAIN))
             break;
 

diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c
index 8526b7b9852fa54d442be2bec81cf723c8825e4d..6e6dd1b1dbf638cd217ae98ef996f542f6f84052 100644 (file)
--- a/src/security/virt-aa-helper.c
+++ b/src/security/virt-aa-helper.c
@@ -898,10 +898,6 @@ storage_source_add_files(virStorageSourcePtr src,
         if (add_file_path(tmp, depth, buf) < 0)
             return -1;
 
-        if (tmp->externalDataStore &&
-            storage_source_add_files(tmp->externalDataStore, buf, depth) < 0)
-            return -1;
-
         depth++;
     }