]> xenbits.xensource.com Git - libvirt.git/commitdiff
selinux: Don't mask errors of virSecuritySELinuxGenNewContext
authorPeter Krempa <pkrempa@redhat.com>
Wed, 24 Apr 2013 12:38:54 +0000 (14:38 +0200)
committerPeter Krempa <pkrempa@redhat.com>
Wed, 24 Apr 2013 14:03:35 +0000 (16:03 +0200)
Since cbe67ff9b0a5a94911afd4d12388bf182bcca86c
virSecuritySELinuxGenNewContext reports good error messages. Fix callers
that mask the errors by generic error message.

src/security/security_selinux.c

index c620a2ed25c3f74f99c61635c26f43993a4cbe27..61ff1de79367856c97073e83a75bddaeb84abab1 100644 (file)
@@ -685,13 +685,10 @@ virSecuritySELinuxGenSecurityLabel(virSecurityManagerPtr mgr,
             }
         }
 
-        seclabel->label =
-            virSecuritySELinuxGenNewContext(baselabel, mcs, false);
-        if (!seclabel->label)  {
-            virReportError(VIR_ERR_INTERNAL_ERROR,
-                           _("cannot generate selinux context for %s"), mcs);
+        seclabel->label = virSecuritySELinuxGenNewContext(baselabel, mcs, false);
+        if (!seclabel->label)
             goto cleanup;
-        }
+
         break;
 
     case VIR_DOMAIN_SECLABEL_NONE:
@@ -709,11 +706,8 @@ virSecuritySELinuxGenSecurityLabel(virSecurityManagerPtr mgr,
         seclabel->imagelabel = virSecuritySELinuxGenNewContext(data->file_context,
                                                                mcs,
                                                                true);
-        if (!seclabel->imagelabel)  {
-            virReportError(VIR_ERR_INTERNAL_ERROR,
-                           _("cannot generate selinux context for %s"), mcs);
+        if (!seclabel->imagelabel)
             goto cleanup;
-        }
     }
 
     if (!seclabel->model &&