|
 |
3d71c6 |
From: Ken Gaillot <kgaillot@redhat.com>
|
|
|
3d71c6 |
Date: Wed, 23 Sep 2015 10:45:39 -0500
|
|
|
3d71c6 |
Subject: [PATCH] Fix: liblrmd: don't print error if remote key environment
|
|
|
3d71c6 |
variable unset
|
|
|
3d71c6 |
|
|
|
3d71c6 |
20c2178 added error logging if the remote key was unable to be read,
|
|
|
3d71c6 |
however it would also log an error in the usual case where the
|
|
|
3d71c6 |
environment variable was simply unset.
|
|
|
3d71c6 |
|
|
|
3d71c6 |
(cherry picked from commit dec3349f1252e2c2c18ed110b8cc4a2b2212b613)
|
|
|
3d71c6 |
---
|
|
|
3d71c6 |
lib/lrmd/lrmd_client.c | 6 +++---
|
|
|
3d71c6 |
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
|
3d71c6 |
|
|
|
3d71c6 |
diff --git a/lib/lrmd/lrmd_client.c b/lib/lrmd/lrmd_client.c
|
|
|
3d71c6 |
index 1f1ffde..f365e59 100644
|
|
|
3d71c6 |
--- a/lib/lrmd/lrmd_client.c
|
|
|
3d71c6 |
+++ b/lib/lrmd/lrmd_client.c
|
|
|
3d71c6 |
@@ -1062,8 +1062,8 @@ lrmd_tls_set_key(gnutls_datum_t * key)
|
|
|
3d71c6 |
crm_debug("Using custom authkey location %s", specific_location);
|
|
|
3d71c6 |
return 0;
|
|
|
3d71c6 |
|
|
|
3d71c6 |
- } else {
|
|
|
3d71c6 |
- crm_err("No lrmd remote key found at %s, trying default locations", specific_location);
|
|
|
3d71c6 |
+ } else if (specific_location) {
|
|
|
3d71c6 |
+ crm_err("No valid lrmd remote key found at %s, trying default location", specific_location);
|
|
|
3d71c6 |
}
|
|
|
3d71c6 |
|
|
|
3d71c6 |
if (set_key(key, DEFAULT_REMOTE_KEY_LOCATION) != 0) {
|
|
|
3d71c6 |
@@ -1071,7 +1071,7 @@ lrmd_tls_set_key(gnutls_datum_t * key)
|
|
|
3d71c6 |
}
|
|
|
3d71c6 |
|
|
|
3d71c6 |
if (rc) {
|
|
|
3d71c6 |
- crm_err("No lrmd remote key found at %s", DEFAULT_REMOTE_KEY_LOCATION);
|
|
|
3d71c6 |
+ crm_err("No valid lrmd remote key found at %s", DEFAULT_REMOTE_KEY_LOCATION);
|
|
|
3d71c6 |
return -1;
|
|
|
3d71c6 |
}
|
|
|
3d71c6 |
|