merge from ronnie

(This used to be ctdb commit d21de127cceea7174b2e05701c8846c0b0c881c0)

diff --cc ctdb/common/ctdb_control.c
Simple merge

diff --cc ctdb/include/ctdb.h
index af4198887e22f9860d7686b809e8caf6e0990ee2,0dd8c90c799d0b55b0c471ca977032988f18ace8..9c5d2399d6c7871b36391dd537f7c124eb6b58b8
--- 1/ctdb/include/ctdb.h
--- 2/ctdb/include/ctdb.h
+++ b/ctdb/include/ctdb.h
@@@ -56,7 -56,7 +56,7 @@@ struct ctdb_call_info 
  /* 
     a message handler ID meaning "give me all messages"
   */
- #define CTDB_SRVID_ALL 0xFFFFFFFF
 -#define CTDB_SRVID_ALL 0xFFFFFFFFFFFFFFFFLL
++#define CTDB_SRVID_ALL (~(uint64_t)0)
  
  struct event_context;
  

diff --cc ctdb/include/ctdb_private.h
Simple merge