From: S.Çağlar Onur <caglar@cs.princeton.edu>
Date: Mon, 25 Jan 2010 19:44:55 +0000 (+0000)
Subject: minor build fix for zonekeeperless builds
X-Git-Tag: DistributedRateLimiting-0.1-0~22
X-Git-Url: http://git.onelab.eu/?p=distributedratelimiting.git;a=commitdiff_plain;h=415f6940d383c7a99d688ecfe3c6376784a3061c;hp=3d0e0dc78a4c9829f5c0191da93abfd2abb8f27c

minor build fix for zonekeeperless builds
---

diff --git a/drl/config.c b/drl/config.c
index 261ce0c..86d1ec4 100644
--- a/drl/config.c
+++ b/drl/config.c
@@ -119,7 +119,9 @@ static int parse_common(xmlDocPtr doc, xmlNodePtr ident, ident_config *common) {
     ident_peer *current = NULL;
 
     /* The struct has been memsetted to 0, this is just to be safe. */
+#ifdef BUILD_ZOOKEEPER
     common->zk_host = NULL;
+#endif
     common->peers = NULL;
     common->members = NULL;
     common->next = NULL;
@@ -311,11 +313,12 @@ static int parse_common(xmlDocPtr doc, xmlNodePtr ident, ident_config *common) {
         } else if ((!xmlStrcmp(fields->name, (const xmlChar *) "zkhost"))) {
             xmlChar *host = xmlNodeListGetString(doc, fields->children, 1);
 
+#ifdef BUILD_ZOOKEEPER
             common->zk_host = strdup((const char *) host);
             if (common->zk_host == NULL) {
                 return ENOMEM;
             }
-
+#endif
             xmlFree(host);
         }
         fields = fields->next;
@@ -326,11 +329,12 @@ static int parse_common(xmlDocPtr doc, xmlNodePtr ident, ident_config *common) {
         return EINVAL;
     }
 
+#ifdef BUILD_ZOOKEEPER
     if (common->membership == ZOOKEEPER && common->zk_host == NULL) {
         printlog(LOG_CRITICAL, "Group membership protocol ZOOKEEPER requires a zkhost field.\n");
         return EINVAL;
     }
-
+#endif
     /* No errors. */
     return 0;
 }