summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSol Jerome <sol.jerome@gmail.com>2013-07-01 16:01:11 -0500
committerSol Jerome <sol.jerome@gmail.com>2013-07-01 16:01:11 -0500
commit166ff79220ea44ba53e158b88ebe8cf6f753a1ad (patch)
tree7043148b35750b87ac1570f7d85d61377b7a60d6
parent6f9d6faf954b25e80b6868b096ee306b7dbb94b7 (diff)
parent2519c6dbbd49b06042b4f21f10c6fecfbf7e5230 (diff)
downloadbcfg2-166ff79220ea44ba53e158b88ebe8cf6f753a1ad.tar.gz
bcfg2-166ff79220ea44ba53e158b88ebe8cf6f753a1ad.tar.bz2
bcfg2-166ff79220ea44ba53e158b88ebe8cf6f753a1ad.zip
Merge branch 'bcfg2-info-builddir-add-owner-write' of https://github.com/fennm/bcfg2 into maint
-rw-r--r--src/lib/Bcfg2/Client/Tools/POSIX/base.py12
1 files changed, 3 insertions, 9 deletions
diff --git a/src/lib/Bcfg2/Client/Tools/POSIX/base.py b/src/lib/Bcfg2/Client/Tools/POSIX/base.py
index 16fe0acb5..3778569a6 100644
--- a/src/lib/Bcfg2/Client/Tools/POSIX/base.py
+++ b/src/lib/Bcfg2/Client/Tools/POSIX/base.py
@@ -706,16 +706,10 @@ class POSIXTool(Bcfg2.Client.Tools.Tool):
(path, err))
rv = False
- # we need to make sure that we give +x to everyone who needs
- # it. E.g., if the file that's been distributed is 0600, we
- # can't make the parent directories 0600 also; that'd be
- # pretty useless. They need to be 0700.
+ # set auto-created directories to mode 755, if you need
+ # something else, you should specify it in your config
tmpentry = copy.deepcopy(entry)
- newmode = int(entry.get('mode'), 8)
- for i in range(0, 3):
- if newmode & (6 * pow(8, i)):
- newmode |= 1 * pow(8, i)
- tmpentry.set('mode', oct_mode(newmode))
+ tmpentry.set('mode', '0755')
for acl in tmpentry.findall('ACL'):
acl.set('perms',
oct_mode(self._norm_acl_perms(acl.get('perms')) |