Merge branch 'maint'

Signed-off-by: Sol Jerome <sol.jerome@gmail.com>

Conflicts:
	src/lib/Bcfg2/Client/Tools/__init__.py
	src/lib/Bcfg2/Server/BuiltinCore.py
	src/lib/Bcfg2/Server/Plugins/Metadata.py
	src/lib/Bcfg2/Server/Plugins/NagiosGen.py
	src/lib/Bcfg2/Server/Plugins/Probes.py
	src/lib/Bcfg2/Server/SSLServer.py
	tools/README

3 files changed, 19 insertions, 6 deletions

diff --git a/src/lib/Bcfg2/Client/Tools/POSIX/File.py b/src/lib/Bcfg2/Client/Tools/POSIX/File.py
index 482320e0d..c12188e1c 100644
--- a/src/lib/Bcfg2/Client/Tools/POSIX/File.py
+++ b/src/lib/Bcfg2/Client/Tools/POSIX/File.py
@@ -54,6 +54,10 @@ class POSIXFile(POSIXTool):
     def verify(self, entry, modlist):
         ondisk = self._exists(entry)
         tempdata, is_binary = self._get_data(entry)
+        if isinstance(tempdata, str) and str != unicode:
+            tempdatasize = len(tempdata)
+        else:
+            tempdatasize = len(tempdata.encode(self.setup['encoding']))
 
         different = False
         content = None
@@ -62,7 +66,7 @@ class POSIXFile(POSIXTool):
             # they're clearly different
             different = True
             content = ""
-        elif len(tempdata) != ondisk[stat.ST_SIZE]:
+        elif tempdatasize != ondisk[stat.ST_SIZE]:
             # next, see if the size of the target file is different
             # from the size of the desired content
             different = True
@@ -73,6 +77,9 @@ class POSIXFile(POSIXTool):
             # for everything else
             try:
                 content = open(entry.get('name')).read()
+            except UnicodeDecodeError:
+                content = open(entry.get('name'),
+                               encoding=self.setup['encoding']).read()
             except IOError:
                 self.logger.error("POSIX: Failed to read %s: %s" %
                                   (entry.get("name"), sys.exc_info()[1]))
@@ -90,7 +97,7 @@ class POSIXFile(POSIXTool):
 
     def _write_tmpfile(self, entry):
         """ Write the file data to a temp file """
-        filedata, _ = self._get_data(entry)
+        filedata = self._get_data(entry)[0]
         # get a temp file to write to that is in the same directory as
         # the existing file in order to preserve any permissions
         # protections on that directory, and also to avoid issues with
@@ -106,7 +113,11 @@ class POSIXFile(POSIXTool):
                               (os.path.dirname(entry.get('name')), err))
             return False
         try:
-            os.fdopen(newfd, 'w').write(filedata)
+            if isinstance(filedata, str) and str != unicode:
+                os.fdopen(newfd, 'w').write(filedata)
+            else:
+                os.fdopen(newfd, 'wb').write(
+                    filedata.encode(self.setup['encoding']))
         except (OSError, IOError):
             err = sys.exc_info()[1]
             self.logger.error("POSIX: Failed to open temp file %s for writing "
diff --git a/src/lib/Bcfg2/Client/Tools/POSIX/base.py b/src/lib/Bcfg2/Client/Tools/POSIX/base.py
index c9164cb88..bd2f8f87e 100644
--- a/src/lib/Bcfg2/Client/Tools/POSIX/base.py
+++ b/src/lib/Bcfg2/Client/Tools/POSIX/base.py
@@ -525,7 +525,8 @@ class POSIXTool(Bcfg2.Client.Tools.Tool):
             if entry.get("secontext") == "__default__":
                 try:
                     wanted_secontext = \
-                        selinux.matchpathcon(path, 0)[1].split(":")[2]
+                        selinux.matchpathcon(
+                            path, ondisk[stat.ST_MODE])[1].split(":")[2]
                 except OSError:
                     errors.append("%s has no default SELinux context" %
                                   entry.get("name"))
diff --git a/src/lib/Bcfg2/Client/Tools/__init__.py b/src/lib/Bcfg2/Client/Tools/__init__.py
index aab2459f2..4a808aa60 100644
--- a/src/lib/Bcfg2/Client/Tools/__init__.py
+++ b/src/lib/Bcfg2/Client/Tools/__init__.py
@@ -590,14 +590,15 @@ class SvcTool(Tool):
             if not self.handlesEntry(entry):
                 continue
 
+            estatus = entry.get('status')
             restart = entry.get("restart", "true").lower()
-            if (restart == "false" or
+            if (restart == "false" or estatus == 'ignore' or
                 (restart == "interactive" and
                  not Bcfg2.Options.setup.interactive)):
                 continue
 
             success = False
-            if entry.get('status') == 'on':
+            if estatus == 'on':
                 if Bcfg2.Options.setup.service_mode == 'build':
                     success = self.stop_service(entry)
                 elif entry.get('name') not in self.restarted: