]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
config: correctly notify when OPT_ADDR config options are found.
authorGreg Farnum <gregf@hq.newdream.net>
Mon, 12 Jul 2010 18:32:23 +0000 (11:32 -0700)
committerGreg Farnum <gregf@hq.newdream.net>
Tue, 3 Aug 2010 21:56:01 +0000 (14:56 -0700)
src/config.cc

index 0545f1b569ae798ef9668ced403ed994fa76a31b..82c40e26851082ca2d729a6e2a02d3265cf0581a 100644 (file)
@@ -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;