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

Merge pull request #26242 from cro/anonldap4

Browse Source 
Remove dead code
This commit is contained in:
C. R. Oldham 2015-08-12 09:14:20 -06:00
commit da8bca09aa
1 changed files with 3 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
salt/master.py
View File

@ -16,6 +16,7 @@ import resource
import multiprocessing
import sys
import tempfile
import traceback
# Import third party libs
import zmq
@ -2017,19 +2018,12 @@ class ClearFuncs(object):
return ''
return self.loadauth.mk_token(clear_load)
except Exception as exc:
import sys
import traceback
type_, value_, traceback_ = sys.exc_info()
log.error(
'ARGH Exception occurred while authenticating: {0}'.format(exc)
)
log.error(traceback.format_exception(
type_, value_, traceback_))
return ''
log.error(
'Exception occurred while authenticating: {0}'.format(exc)
)
log.error(traceback.format_exception(
type_, value_, traceback_))
return ''
def get_token(self, clear_load):
@ -2170,9 +2164,6 @@ class ClearFuncs(object):
return ''
except Exception as exc:
import sys
import traceback
type_, value_, traceback_ = sys.exc_info()
log.error(
'Exception occurred while authenticating: {0}'.format(exc)
@ -2180,10 +2171,6 @@ class ClearFuncs(object):
log.error(traceback.format_exception(
type_, value_, traceback_))
return ''
log.error(
'Exception occurred while authenticating: {0}'.format(exc)
)
return ''
# auth_list = self.opts['external_auth'][extra['eauth']][name] if name in self.opts['external_auth'][extra['eauth']] else self.opts['external_auth'][extra['eauth']]['*']