shill: Don't execute critical code in LOG_IF.
Also, add extra OpenVPN management interface logging.
BUG=chromium-os:31687
TEST=unit tests
Change-Id: Ia0c350f4fc8efa7b788cffd49b0092e294468c15
Reviewed-on: https://gerrit.chromium.org/gerrit/24957
Tested-by: Darin Petkov <petkov@chromium.org>
Reviewed-by: Paul Stewart <pstew@chromium.org>
Commit-Ready: Darin Petkov <petkov@chromium.org>
diff --git a/crypto_provider.cc b/crypto_provider.cc
index 1ca4b04..f41af3f 100644
--- a/crypto_provider.cc
+++ b/crypto_provider.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium OS Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -53,8 +53,10 @@
string to_decrypt = ciphertext;
to_decrypt.erase(0, prefix.size());
string plaintext;
- LOG_IF(WARNING, !crypto->Decrypt(to_decrypt, &plaintext))
- << "Crypto module " << crypto->GetID() << " failed to decrypt.";
+ if (!crypto->Decrypt(to_decrypt, &plaintext)) {
+ LOG(WARNING) << "Crypto module " << crypto->GetID()
+ << " failed to decrypt.";
+ }
return plaintext;
}
}