]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
monclient: fix resolve_addrs() call
authorSage Weil <sage@newdream.net>
Wed, 11 Jan 2012 00:39:23 +0000 (16:39 -0800)
committerSage Weil <sage@newdream.net>
Wed, 11 Jan 2012 00:39:23 +0000 (16:39 -0800)
This was broken in def36668a13459d9c0851e4d4da440a288f9a34f it looks like.
Passing uninitialized memory to resolve_addrs(), and needlessly
allocating a buffer.

Signed-off-by: Sage Weil <sage@newdream.net>
src/mon/MonClient.cc

index 1ea49dcdcb34a23b673cb27026bb950e004a50c7..38f07725d9cd3e42cdf0ed4544b154f1d8845b93 100644 (file)
@@ -120,9 +120,7 @@ int MonClient::build_initial_monmap(CephContext *cct, MonMap &monmap)
       return 0;
     } else { //maybe they passed us a DNS-resolvable name
       char *hosts = NULL;
-      char *old_addrs = new char[conf->mon_host.size() + 1];
-      hosts = resolve_addrs(old_addrs);
-      delete [] old_addrs;
+      hosts = resolve_addrs(conf->mon_host.c_str());
       if (!hosts)
         return -EINVAL;
       bool success = parse_ip_port_vec(hosts, addrs);