Merge branch 'options-rewrite'

Conflicts:
	src/lib/Bcfg2/Client/Frame.py
	src/lib/Bcfg2/Options.py
	src/lib/Bcfg2/Server/Admin/Init.py
	src/lib/Bcfg2/Server/Admin/Xcmd.py
	src/lib/Bcfg2/Server/BuiltinCore.py
	src/lib/Bcfg2/Server/Core.py
	src/lib/Bcfg2/Server/MultiprocessingCore.py
	src/lib/Bcfg2/Server/Plugin/base.py
	src/lib/Bcfg2/Server/Plugin/helpers.py
	src/lib/Bcfg2/Server/Plugins/Cfg/__init__.py
	src/lib/Bcfg2/Server/Plugins/Packages/Yum.py
	src/lib/Bcfg2/Server/Plugins/Packages/__init__.py
	src/lib/Bcfg2/Server/SSLServer.py
	src/lib/Bcfg2/Utils.py
	src/lib/Bcfg2/settings.py
	src/sbin/bcfg2-crypt
	src/sbin/bcfg2-info
	src/sbin/bcfg2-lint
	src/sbin/bcfg2-test
	src/sbin/bcfg2-yum-helper
	tools/bcfg2-profile-templates.py

1 files changed, 17 insertions, 17 deletions

diff --git a/src/lib/Bcfg2/Client/Tools/POSIX/base.py b/src/lib/Bcfg2/Client/Tools/POSIX/base.py
index fb5d06e54..c9164cb88 100644
--- a/src/lib/Bcfg2/Client/Tools/POSIX/base.py
+++ b/src/lib/Bcfg2/Client/Tools/POSIX/base.py
@@ -105,23 +105,23 @@ class POSIXTool(Bcfg2.Client.Tools.Tool):
             path = entry.get("name")
 
         rv = True
-        if entry.get("owner") and entry.get("group"):
-            try:
-                self.logger.debug("POSIX: Setting ownership of %s to %s:%s" %
-                                  (path,
-                                   self._norm_entry_uid(entry),
-                                   self._norm_entry_gid(entry)))
-                os.chown(path, self._norm_entry_uid(entry),
-                         self._norm_entry_gid(entry))
-            except KeyError:
-                self.logger.error('POSIX: Failed to change ownership of %s' %
-                                  path)
-                rv = False
-                os.chown(path, 0, 0)
-            except OSError:
-                self.logger.error('POSIX: Failed to change ownership of %s' %
-                                  path)
-                rv = False
+        if os.geteuid() == 0:
+            if entry.get("owner") and entry.get("group"):
+                try:
+                    self.logger.debug("POSIX: Setting ownership of %s to %s:%s"
+                                      % (path,
+                                         self._norm_entry_uid(entry),
+                                         self._norm_entry_gid(entry)))
+                    os.chown(path, self._norm_entry_uid(entry),
+                             self._norm_entry_gid(entry))
+                except (OSError, KeyError):
+                    self.logger.error('POSIX: Failed to change ownership of %s'
+                                      % path)
+                    rv = False
+                    if sys.exc_info()[0] == KeyError:
+                        os.chown(path, 0, 0)
+        else:
+            self.logger.debug("POSIX: Run as non-root, not setting ownership")
 
         if entry.get("mode"):
             wanted_mode = int(entry.get('mode'), 8)