From: Sage Weil <sage@newdream.net>
Date: Fri, 11 Jun 2010 17:15:29 +0000 (-0700)
Subject: monmaptool: don't allow dup names, addrs to be added to the map
X-Git-Tag: v0.22~369
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8cc096f6523680fcab617ee45cb33b866ea03aa1;p=ceph.git

monmaptool: don't allow dup names, addrs to be added to the map
---

diff --git a/src/monmaptool.cc b/src/monmaptool.cc
index 4e7a877e946..2c6f8ecb679 100644
--- a/src/monmaptool.cc
+++ b/src/monmaptool.cc
@@ -109,8 +109,17 @@ int main(int argc, const char **argv)
     modified++;
   }
 
-  for (map<string,entity_addr_t>::iterator p = add.begin(); p != add.end(); p++)
+  for (map<string,entity_addr_t>::iterator p = add.begin(); p != add.end(); p++) {
+    if (monmap.contains(p->first)) {
+      cerr << me << ": map already contains mon." << p->first << std::endl;
+      usage();
+    }
+    if (monmap.contains(p->second)) {
+      cerr << me << ": map already contains " << p->second << std::endl;
+      usage();
+    }
     monmap.add(p->first, p->second);
+  }
   for (list<string>::iterator p = rm.begin(); p != rm.end(); p++) {
     cout << me << ": removing " << *p << std::endl;
     if (!monmap.contains(*p)) {