valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-09 01:36:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use the loader, not the loadauth class

Browse Source
This commit is contained in:
Thomas S Hatch 2012-10-05 14:20:37 -06:00
parent 014d025d28
commit 08bd292ed4
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
salt/auth/__init__.py
View File

@ -134,7 +134,7 @@ class Resolver(object):
'''
def __init__(self, opts):
self.opts = opts
self.loadauth = LoadAuth(opts)
self.auth = salt.loader.auth(opts)
def cli(self, eauth):
'''
@ -146,12 +146,12 @@ class Resolver(object):
print 'External authentication system has not been specified'
return ret
fstr = '{0}.auth'.format(eauth)
if not fstr in self.loadauth:
if not fstr in self.auth:
print ('The specified external authentication system "{0}" is '
'not available').format(eauth)
return ret
args = salt.utils.arg_lookup(self.loadauth[fstr])
args = salt.utils.arg_lookup(self.auth[fstr])
for arg in args['args']:
if arg.startswith('pass'):
ret[arg] = getpass.getpass('{0}: '.format(arg))