saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #30998 from dmacvicar/dmacvicar-2015.8-27796

Browse source 
add_key/reject_key: do not crash w/Permission denied: '/var/cache/salt/master/.dfn' (#27796)
This commit is contained in:
Mike Place 2016-02-09 10:57:36 -07:00
commit 0dcdd0a2a7
1 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
salt/crypt.py
View file

@ -55,6 +55,9 @@ def dropfile(cachedir, user=None):
mask = os.umask(191)
try:
log.info('Rotating AES key')
if os.path.isfile(dfn):
log.info('AES key rotation already requested')
return
with salt.utils.fopen(dfn, 'wb+') as fp_:
fp_.write('')