valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

remove extra call to time_auth

Browse Source
This commit is contained in:
Jeremy Rosenbaum 2015-09-03 16:46:14 -07:00
parent c3a2355a62
commit 77daaa31ea
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
salt/master.py
View File

@ -1715,12 +1715,14 @@ class ClearFuncs(object):
if not found:
log.warning('Authentication failure of type "eauth" occurred.')
return ''
if not self.loadauth.time_auth(clear_load):
log.warning('Authentication failure of type "eauth" occurred.')
return ''
clear_load['groups'] = groups
return self.loadauth.mk_token(clear_load)
token = self.loadauth.mk_token(clear_load)
if not token:
log.warning('Authentication failure of type "eauth" occurred.')
return ''
else:
return token
except Exception as exc:
type_, value_, traceback_ = sys.exc_info()
log.error(