salt: fix patch after upstream code change

fixes #20458
This commit is contained in:
Robin Gloster 2016-12-23 12:28:06 +01:00
parent de44544ceb
commit c8982c015c
No known key found for this signature in database
GPG Key ID: 5E4C836C632C2882

View File

@ -2,10 +2,10 @@ diff --git a/salt/utils/rsax931.py b/salt/utils/rsax931.py
index 9eb1f4a..d764f7a 100644
--- a/salt/utils/rsax931.py
+++ b/salt/utils/rsax931.py
@@ -36,7 +36,7 @@ def _load_libcrypto():
@@ -36,7 +36,6 @@ def _load_libcrypto():
'libcrypto.so*'))
lib = lib[0] if len(lib) > 0 else None
if lib:
- if lib:
- return cdll.LoadLibrary(lib)
+ return cdll.LoadLibrary('@libcrypto@')
+ return cdll.LoadLibrary('@libcrypto@')
raise OSError('Cannot locate OpenSSL libcrypto')