Merge branch 'next'

2 files changed, 12 insertions, 6 deletions

diff --git a/src/common/Preforker.h b/src/common/Preforker.h
index 20e8b00be15..2c1d4fd6795 100644
--- a/src/common/Preforker.h
+++ b/src/common/Preforker.h
@@ -79,13 +79,13 @@ public:
   int signal_exit(int r) {
     if (forked) {
       // tell parent
-      (void)::write(fd[1], &r, sizeof(r));
+      (void)safe_write(fd[1], &r, sizeof(r));
     }
     return r;
   }
   void exit(int r) {
     signal_exit(r);
-    exit(r);
+    ::exit(r);
   }
 
   void daemonize() {
diff --git a/src/osd/OSDMap.cc b/src/osd/OSDMap.cc
index cc7646b495b..711997782a8 100644
--- a/src/osd/OSDMap.cc
+++ b/src/osd/OSDMap.cc
@@ -609,10 +609,16 @@ bool OSDMap::is_blacklisted(const entity_addr_t& a) const
     return true;
 
   // is entire ip blacklisted?
-  entity_addr_t b = a;
-  b.set_port(0);
-  b.set_nonce(0);
-  return blacklist.count(b);
+  if (a.is_ip()) {
+    entity_addr_t b = a;
+    b.set_port(0);
+    b.set_nonce(0);
+    if (blacklist.count(b)) {
+      return true;
+    }
+  }
+
+  return false;
 }
 
 void OSDMap::get_blacklist(list<pair<entity_addr_t,utime_t> > *bl) const