From: Greg Farnum <gregf@hq.newdream.net>
Date: Mon, 12 Jul 2010 18:32:23 +0000 (-0700)
Subject: config: correctly notify when OPT_ADDR config options are found.
X-Git-Tag: v0.22~330
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d6c8f8c801c05ff645d4967972f37d67f9901ba1;p=ceph.git

config: correctly notify when OPT_ADDR config options are found.
---

diff --git a/src/config.cc b/src/config.cc
index 0545f1b569a..82c40e26851 100644
--- a/src/config.cc
+++ b/src/config.cc
@@ -926,7 +926,15 @@ int conf_read_key_ext(const char *conf_name, const char *conf_alt_name, const ch
       OPT_READ_TYPE(ret, section, key, double, out, def);
       break;
     case OPT_ADDR:
-      OPT_READ_TYPE(ret, section, key, char *, out, def);
+      ret = cf->read(section, key, &tmp, (char *)def);
+      if (*tmp == *((char *)def)) {
+          ret = 0;
+      }
+      else {
+        ret = 1;
+      }
+      ((entity_addr_t*)out)->parse(tmp);
+      break;
     default:
 	ret = 0;
         break;