From c19c638a5cc23f1166eb21fa3814e0d53d563d23 Mon Sep 17 00:00:00 2001 From: Sol Jerome Date: Wed, 16 Jun 2010 13:50:32 +0000 Subject: POSIX: Don't set perms for unspecified entries (Resolves ticket #893) We were previously setting permissions to '0000' for entries that were incorrectly specified (missing 'perms' attribute). This fixes that and requests the user run bcfg2-repo-validate. Signed-off-by: Sol Jerome git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@5939 ce84e21b-d406-0410-9b95-82705330c041 --- src/lib/Client/Tools/POSIX.py | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'src') diff --git a/src/lib/Client/Tools/POSIX.py b/src/lib/Client/Tools/POSIX.py index 19dd34b1a..03f29d9e9 100644 --- a/src/lib/Client/Tools/POSIX.py +++ b/src/lib/Client/Tools/POSIX.py @@ -168,6 +168,8 @@ class POSIX(Bcfg2.Client.Tools.Tool): def VerifyDirectory(self, entry, modlist): """Verify Directory entry.""" + if entry.get('perms') == None: + return False while len(entry.get('perms', '')) < 4: entry.set('perms', '0' + entry.get('perms', '')) try: @@ -375,6 +377,12 @@ class POSIX(Bcfg2.Client.Tools.Tool): def InstallPermissions(self, entry): """Install POSIX permissions""" + if entry.get('perms') == None or \ + entry.get('owner') == None or \ + entry.get('group') == None: + self.logger.error('Entry %s not completely specified. ' + 'Try running bcfg2-repo-validate.' % (entry.get('name'))) + return False try: os.chown(entry.get('name'), normUid(entry), normGid(entry)) os.chmod(entry.get('name'), calcPerms(S_IFDIR, entry.get('perms'))) -- cgit v1.2.3-1-g7c22