diff options
| author | Saturn&Eric <[email protected]> | 2021-12-16 21:20:56 +0000 |
|---|---|---|
| committer | GitHub <[email protected]> | 2021-12-16 21:20:56 +0000 |
| commit | 52ac9979bd8c4820a0034d619cb7d1d3e4105d8b (patch) | |
| tree | c7524432467825603d83a17f398249d431c28b18 /src/gpg/function/GpgKeyOpera.cpp | |
| parent | Merge pull request #32 from saturneric/develop (diff) | |
| parent | Fixed bugs & Improve Speed. (diff) | |
| download | GpgFrontend-52ac9979bd8c4820a0034d619cb7d1d3e4105d8b.tar.gz GpgFrontend-52ac9979bd8c4820a0034d619cb7d1d3e4105d8b.zip | |
Merge pull request #34 from saturneric/develop
v2.0.3
Diffstat (limited to 'src/gpg/function/GpgKeyOpera.cpp')
| -rw-r--r-- | src/gpg/function/GpgKeyOpera.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/gpg/function/GpgKeyOpera.cpp b/src/gpg/function/GpgKeyOpera.cpp index cdf5ab24..4bad303d 100644 --- a/src/gpg/function/GpgKeyOpera.cpp +++ b/src/gpg/function/GpgKeyOpera.cpp @@ -66,8 +66,6 @@ GpgFrontend::GpgError GpgFrontend::GpgKeyOpera::SetExpire( std::unique_ptr<boost::posix_time::ptime>& expires) { unsigned long expires_time = 0; - LOG(INFO) << "expires" << *expires; - if (expires != nullptr) { using namespace boost::posix_time; using namespace std::chrono; @@ -78,7 +76,7 @@ GpgFrontend::GpgError GpgFrontend::GpgKeyOpera::SetExpire( LOG(INFO) << key.id() << subkey_fpr << expires_time; GpgError err; - if (subkey_fpr.empty()) + if (key.fpr() == subkey_fpr || subkey_fpr.empty()) err = gpgme_op_setexpire(ctx, gpgme_key_t(key), expires_time, nullptr, 0); else err = gpgme_op_setexpire(ctx, gpgme_key_t(key), expires_time, |