ACK
On 09/16/2011 10:31 AM, Adam Stokes wrote:
Signed-off-by: Adam Stokes<astokes(a)fedoraproject.org>
---
src/lib/mh_agent.cpp | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/lib/mh_agent.cpp b/src/lib/mh_agent.cpp
index 4a7cbf1..47f7550 100644
--- a/src/lib/mh_agent.cpp
+++ b/src/lib/mh_agent.cpp
@@ -377,23 +377,23 @@ read_environment(OptionsMap& options)
const char *data;
data = getenv("MATAHARI_BROKER");
- if (data&& strlen(data)) {
+ if (!mh_strlen_zero(data)) {
options["servername"] = data;
}
data = getenv("MATAHARI_PORT");
- if (data&& strlen(data)) {
+ if (!mh_strlen_zero(data)) {
options["serverport"] = data;
}
data = getenv("KRB5_KEYTAB");
- if (data&& strlen(data)) {
+ if (!mh_strlen_zero(data)) {
options["krb5_keytab"] = data;
} else {
options["krb5_keytab"] = "/etc/krb5.keytab";
}
data = getenv("KRB5_INTERVAL");
- if (data&& strlen(data)) {
+ if (!mh_strlen_zero(data)) {
options["krb5_interval"] = data;
} else {
options["krb5_interval"] = "10";
--
Russell Bryant