Merge pull request #12550 from redrampage/remove-pw-salt-deletion

Removed deletion of salt by 'password' lookup
This commit is contained in:
Brian Coca 2015-10-12 11:33:19 -04:00
commit f5f3bf06e4

View file

@ -150,11 +150,6 @@ class LookupModule(LookupBase):
with open(path, 'w') as f:
os.chmod(path, 0o600)
f.write(content + '\n')
# crypt not requested, remove salt if present
elif (params['encrypt'] is None and salt):
with open(path, 'w') as f:
os.chmod(path, 0o600)
f.write(password + '\n')
if params['encrypt']:
password = do_encrypt(password, params['encrypt'], salt=salt)