cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

In cronvar only use '-u {user}' if self.user is not the current user

Browse source 
Use the same logic as in the cron module.
This commit is contained in:
Arne de Laat 2017-02-23 13:29:46 +01:00 committed by Brian Coca
parent c581ae4b8d
commit c536f7789b
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/ansible/modules/system/cronvar.py
View file

@ -315,7 +315,7 @@ class CronVar(object):
return "%s -l %s" % (pipes.quote(CRONCMD), pipes.quote(self.user))
elif platform.system() == 'HP-UX':
return "%s %s %s" % (CRONCMD , '-l', pipes.quote(self.user))
else:
elif pwd.getpwuid(os.getuid())[0] != self.user:
user = '-u %s' % pipes.quote(self.user)
return "%s %s %s" % (CRONCMD , user, '-l')
@ -327,7 +327,7 @@ class CronVar(object):
if self.user:
if platform.system() in ['SunOS', 'HP-UX', 'AIX']:
return "chown %s %s ; su '%s' -c '%s %s'" % (pipes.quote(self.user), pipes.quote(path), pipes.quote(self.user), CRONCMD, pipes.quote(path))
else:
elif pwd.getpwuid(os.getuid())[0] != self.user:
user = '-u %s' % pipes.quote(self.user)
return "%s %s %s" % (CRONCMD , user, pipes.quote(path))