From: Peter Krempa <pkrempa@redhat.com>
Date: Thu, 10 Jul 2014 13:20:24 +0000 (+0200)
Subject: security: DAC: Remove superfluous link resolution
X-Git-Tag: v1.2.7-rc1~25
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9f28599d5140ce38a5600870e28aaf1b9e6bfe93;p=thirdparty%2Flibvirt.git

security: DAC: Remove superfluous link resolution

When restoring security labels in the dac driver the code would resolve
the file path and use the resolved one to be chown-ed. The setting code
doesn't do that. Remove the unnecessary code.
---

diff --git a/src/security/security_dac.c b/src/security/security_dac.c
index 4d2a9d6ef6..cdb2735bad 100644
--- a/src/security/security_dac.c
+++ b/src/security/security_dac.c
@@ -264,27 +264,10 @@ virSecurityDACSetOwnership(const char *path, uid_t uid, gid_t gid)
 static int
 virSecurityDACRestoreSecurityFileLabel(const char *path)
 {
-    struct stat buf;
-    int rc = -1;
-    char *newpath = NULL;
-
     VIR_INFO("Restoring DAC user and group on '%s'", path);
 
-    if (virFileResolveLink(path, &newpath) < 0) {
-        virReportSystemError(errno,
-                             _("cannot resolve symlink %s"), path);
-        goto err;
-    }
-
-    if (stat(newpath, &buf) != 0)
-        goto err;
-
     /* XXX record previous ownership */
-    rc = virSecurityDACSetOwnership(newpath, 0, 0);
-
- err:
-    VIR_FREE(newpath);
-    return rc;
+    return virSecurityDACSetOwnership(path, 0, 0);
 }