diff options
| author | Ivan Kohler <ivan@freeside.biz> | 2017-08-06 10:11:28 -0700 |
|---|---|---|
| committer | Ivan Kohler <ivan@freeside.biz> | 2017-08-06 10:11:28 -0700 |
| commit | de9d037528895f7151a9aead6724ce2df95f9586 (patch) | |
| tree | 3ba47a923a1d6033605ffc5586ed1af439d8c141 /rt/lib/RT/Crypt | |
| parent | b226bc6bd81f999176cdbfa53a799033ff0a0307 (diff) | |
rt 4.2.14 (#13852)
Diffstat (limited to 'rt/lib/RT/Crypt')
| -rw-r--r-- | rt/lib/RT/Crypt/GnuPG.pm | 2 | ||||
| -rw-r--r-- | rt/lib/RT/Crypt/GnuPG/CRLFHandle.pm | 2 | ||||
| -rw-r--r-- | rt/lib/RT/Crypt/Role.pm | 2 | ||||
| -rw-r--r-- | rt/lib/RT/Crypt/SMIME.pm | 10 |
4 files changed, 12 insertions, 4 deletions
diff --git a/rt/lib/RT/Crypt/GnuPG.pm b/rt/lib/RT/Crypt/GnuPG.pm index e986447c8..69d25bbcb 100644 --- a/rt/lib/RT/Crypt/GnuPG.pm +++ b/rt/lib/RT/Crypt/GnuPG.pm @@ -2,7 +2,7 @@ # # COPYRIGHT: # -# This software is Copyright (c) 1996-2016 Best Practical Solutions, LLC +# This software is Copyright (c) 1996-2017 Best Practical Solutions, LLC # <sales@bestpractical.com> # # (Except where explicitly superseded by other copyright notices) diff --git a/rt/lib/RT/Crypt/GnuPG/CRLFHandle.pm b/rt/lib/RT/Crypt/GnuPG/CRLFHandle.pm index 2dfc45224..f96f4eeb5 100644 --- a/rt/lib/RT/Crypt/GnuPG/CRLFHandle.pm +++ b/rt/lib/RT/Crypt/GnuPG/CRLFHandle.pm @@ -2,7 +2,7 @@ # # COPYRIGHT: # -# This software is Copyright (c) 1996-2016 Best Practical Solutions, LLC +# This software is Copyright (c) 1996-2017 Best Practical Solutions, LLC # <sales@bestpractical.com> # # (Except where explicitly superseded by other copyright notices) diff --git a/rt/lib/RT/Crypt/Role.pm b/rt/lib/RT/Crypt/Role.pm index 6a33e5d77..8e39b95d7 100644 --- a/rt/lib/RT/Crypt/Role.pm +++ b/rt/lib/RT/Crypt/Role.pm @@ -2,7 +2,7 @@ # # COPYRIGHT: # -# This software is Copyright (c) 1996-2016 Best Practical Solutions, LLC +# This software is Copyright (c) 1996-2017 Best Practical Solutions, LLC # <sales@bestpractical.com> # # (Except where explicitly superseded by other copyright notices) diff --git a/rt/lib/RT/Crypt/SMIME.pm b/rt/lib/RT/Crypt/SMIME.pm index 743ab2bb8..fbd8108b2 100644 --- a/rt/lib/RT/Crypt/SMIME.pm +++ b/rt/lib/RT/Crypt/SMIME.pm @@ -2,7 +2,7 @@ # # COPYRIGHT: # -# This software is Copyright (c) 1996-2016 Best Practical Solutions, LLC +# This software is Copyright (c) 1996-2017 Best Practical Solutions, LLC # <sales@bestpractical.com> # # (Except where explicitly superseded by other copyright notices) @@ -184,6 +184,14 @@ sub Probe { \$buf, \$err ) }; + if ($err && $err =~ /Invalid command/) { + ($buf, $err) = ('', ''); + safe_run_child { run3( [$bin, "list", "-commands"], + \undef, + \$buf, \$err + ) }; + } + if ($? or $err) { $RT::Logger->warning( "RT's SMIME libraries couldn't successfully execute openssl.". |