From: Sage Weil <sage@newdream.net>
Date: Fri, 11 Jun 2010 21:05:02 +0000 (-0700)
Subject: monc: handle mon0 or mon.a syntax when pull mon addrs from .conf
X-Git-Tag: v0.22~365
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=bdda73fd1be13083e6bbbc9d05faab989d3f3d65;p=ceph.git

monc: handle mon0 or mon.a syntax when pull mon addrs from .conf
---

diff --git a/src/mon/MonClient.cc b/src/mon/MonClient.cc
index 944e0ea8d40..143d134b53b 100644
--- a/src/mon/MonClient.cc
+++ b/src/mon/MonClient.cc
@@ -83,8 +83,10 @@ int MonClient::build_initial_monmap()
 	     q != c.get_section_list().end();
 	     q++) {
 	  const char *section = (*q)->get_name().c_str();
-	  if (strncmp(section, "mon.", 4) == 0) {
-	    const char *name = section + 4;
+	  if (strncmp(section, "mon", 3) == 0) {
+	    const char *name = section + 3;
+	    if (name[0] == '.')
+	      name++;
 	    char *val = 0;
 	    c.read(section, "mon addr", &val, 0);
 	    if (!val || !val[0])