[node-patches] Change in ovirt-node[master]: fs/__init__: security: Encode filename before restoring it's...

dougsland at redhat.com dougsland at redhat.com
Tue Aug 25 12:31:13 UTC 2015


Douglas Schilling Landgraf has uploaded a new change for review.

Change subject: fs/__init__: security: Encode filename before restoring it's label
......................................................................

fs/__init__: security: Encode filename before restoring it's label

In commit de0e38e6c we added the encode for only one call of
selinux.restorecon. This patch adds in the other two places.

Change-Id: I601f0a08493d2daae19701852aa035aa07b1d7c8
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1252268
Signed-off-by: Douglas Schilling Landgraf <dougsland at redhat.com>
---
M src/ovirt/node/utils/fs/__init__.py
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-node refs/changes/00/45300/1

diff --git a/src/ovirt/node/utils/fs/__init__.py b/src/ovirt/node/utils/fs/__init__.py
index 3e19f2a..99345d5 100644
--- a/src/ovirt/node/utils/fs/__init__.py
+++ b/src/ovirt/node/utils/fs/__init__.py
@@ -94,7 +94,7 @@
     Import is inside the function to address circular imports
     """
     from ...utils import security
-    security.Selinux().restorecon(path)
+    security.Selinux().restorecon(path.encode("utf-8"))
 
 
 class File(base.Base):
@@ -434,7 +434,7 @@
                                    exc_info=True)
                 return -1
 
-            restorecon(abspath)
+            restorecon(abspath.encode("utf-8"))
             return True
 
     def copy_attributes(self, abspath, destpath):


-- 
To view, visit https://gerrit.ovirt.org/45300
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I601f0a08493d2daae19701852aa035aa07b1d7c8
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-node
Gerrit-Branch: master
Gerrit-Owner: Douglas Schilling Landgraf <dougsland at redhat.com>



More information about the node-patches mailing list