From: Martin Kletzander <mkletzan@redhat.com>
Date: Wed, 3 Sep 2014 13:39:15 +0000 (+0200)
Subject: util: don't shadow global umask declaration
X-Git-Tag: CVE-2014-3633~178
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e9f6937454d705deb0ed276d7194dcf12987c2a7;p=thirdparty%2Flibvirt.git

util: don't shadow global umask declaration

Commit 0e1a1a8c introduced umask for virCommand, but the variables
used emit a warning on older compilers about shadowed global
declaration.

Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
---

diff --git a/src/util/vircommand.c b/src/util/vircommand.c
index efb5f69e01..cbe94f8d3b 100644
--- a/src/util/vircommand.c
+++ b/src/util/vircommand.c
@@ -133,7 +133,7 @@ struct _virCommand {
 #if defined(WITH_SECDRIVER_APPARMOR)
     char *appArmorProfile;
 #endif
-    int umask;
+    int mask;
 };
 
 /* See virCommandSetDryRun for description for this variable */
@@ -583,8 +583,8 @@ virExec(virCommandPtr cmd)
 
     /* child */
 
-    if (cmd->umask)
-        umask(cmd->umask);
+    if (cmd->mask)
+        umask(cmd->mask);
     ret = EXIT_CANCELED;
     openmax = sysconf(_SC_OPEN_MAX);
     if (openmax < 0) {
@@ -1085,12 +1085,12 @@ virCommandSetMaxFiles(virCommandPtr cmd, unsigned int files)
     cmd->maxFiles = files;
 }
 
-void virCommandSetUmask(virCommandPtr cmd, int umask)
+void virCommandSetUmask(virCommandPtr cmd, int mask)
 {
     if (!cmd || cmd->has_error)
         return;
 
-    cmd->umask = umask;
+    cmd->mask = mask;
 }
 
 /**