diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-06-27 10:35:22 -0400 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-06-27 10:42:24 -0400 |
| commit | 9f85b41f12bdc5f25d64b91a6c0413949c9c730e (patch) | |
| tree | 89621a8edb804c32dbd54edec372686211c61458 /src/lib/Bcfg2/Client/Tools/POSIX/base.py | |
| parent | 3261f7cf5314a76b85884942d077146fe8f8fc24 (diff) | |
| download | bcfg2-9f85b41f12bdc5f25d64b91a6c0413949c9c730e.tar.gz bcfg2-9f85b41f12bdc5f25d64b91a6c0413949c9c730e.tar.bz2 bcfg2-9f85b41f12bdc5f25d64b91a6c0413949c9c730e.zip | |
Options: migrated client drivers to new parser
Diffstat (limited to 'src/lib/Bcfg2/Client/Tools/POSIX/base.py')
| -rw-r--r-- | src/lib/Bcfg2/Client/Tools/POSIX/base.py | 34 |
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 16fe0acb5..fad458003 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) |