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 #45114 from twangboy/win_fix_pam

Browse source 
Move pam library load to try/except block
This commit is contained in:
Nicole Thomas 2017-12-21 09:37:17 -05:00 • committed by GitHub
commit 7dc3cc4641
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
salt/auth/pam.py
View file

@ -43,7 +43,6 @@ from ctypes.util import find_library
from salt.utils import get_group_list
from salt.ext.six.moves import range # pylint: disable=import-error,redefined-builtin
LIBPAM = CDLL(find_library('pam'))
LIBC = CDLL(find_library('c'))
CALLOC = LIBC.calloc
@ -116,6 +115,7 @@ class PamConv(Structure):
try:
LIBPAM = CDLL(find_library('pam'))
PAM_START = LIBPAM.pam_start
PAM_START.restype = c_int
PAM_START.argtypes = [c_char_p, c_char_p, POINTER(PamConv),