From c31f94d1526ab6e4d7cbbcd4fae8666dcfd5df64 Mon Sep 17 00:00:00 2001
From: Greg Farnum <greg@inktank.com>
Date: Mon, 19 Nov 2012 14:15:30 -0800
Subject: [PATCH] set the nonce unconditionally on bind

---
 src/msg/Accepter.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/msg/Accepter.cc b/src/msg/Accepter.cc
index b95d26afb08..3cd79912496 100644
--- a/src/msg/Accepter.cc
+++ b/src/msg/Accepter.cc
@@ -138,9 +138,9 @@ int Accepter::bind(const entity_addr_t &bind_addr, int avoid_port1, int avoid_po
     assert(msgr->get_need_addr());  // should still be true.
 
   if (msgr->get_myaddr().get_port() == 0) {
-    listen_addr.nonce = nonce;
     msgr->set_myaddr(listen_addr);
   }
+  msgr->get_myaddr().nonce = nonce;
 
   msgr->init_local_connection();
 
-- 
2.47.3