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

Linter fix, clean up un-needed exception handler

Browse source
This commit is contained in:
Daniel A. Wozniak 2023-01-02 16:44:22 -07:00 • committed by Pedro Algarvio
parent 7cae89efe2
commit 406df40ac5
1 changed files with 8 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
salt/auth/pam.py
View file

@ -247,6 +247,7 @@ def authenticate(username, password):
env=env,
stdout=subprocess.PIPE,
stderr=subprocess.PIPE,
check=False,
)
if ret.returncode == 0:
return True
@ -271,16 +272,11 @@ def groups(username, *args, **kwargs):
if __name__ == "__main__":
try:
if _authenticate(
os.environ["SALT_PAM_USERNAME"],
os.environ["SALT_PAM_PASSWORD"],
os.environ["SALT_PAM_SERVICE"],
os.environ["SALT_PAM_ENCODING"],
):
sys.exit(0)
except Exception as exc:
sys.stderr.write(exc)
sys.stderr.flush()
sys.exit(3)
if _authenticate(
os.environ["SALT_PAM_USERNAME"],
os.environ["SALT_PAM_PASSWORD"],
os.environ["SALT_PAM_SERVICE"],
os.environ["SALT_PAM_ENCODING"],
):
sys.exit(0)
sys.exit(1)