Skip to content

Commit

Permalink
salt: fix patch after upstream code change
Browse files Browse the repository at this point in the history
fixes #20458
  • Loading branch information
globin committed Dec 23, 2016
1 parent de44544 commit c8982c0
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions pkgs/tools/admin/salt/fix-libcrypto-loading.patch
Original file line number Diff line number Diff line change
Expand Up @@ -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')

0 comments on commit c8982c0

Please sign in to comment.