Merge commit 'rusty/ports-from-1.0.112' into foo

(This used to be ctdb commit 13e58d92f5f1723e850a82ae030d0ca57e89b1ee)

diff --cc ctdb/client/ctdb_client.c
Simple merge

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

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

diff --cc ctdb/server/ctdb_freeze.c
Simple merge

diff --cc ctdb/server/ctdb_lockwait.c
Simple merge

diff --cc ctdb/server/ctdb_logging.c
index ee4499ca1af1ced1caa3b5085f57d189a8735128,880f844f85450c4eb2fc9f48703d45a8ca7bcf6c..2cc055938f45d268499a5c49d0fb2eb5957cb959
--- 1/ctdb/server/ctdb_logging.c
--- 2/ctdb/server/ctdb_logging.c
+++ b/ctdb/server/ctdb_logging.c
@@@ -116,9 -115,9 +116,10 @@@ int start_syslog_daemon(struct ctdb_con
                return 0;
        }
  
+       debug_extra = talloc_asprintf(NULL, "syslogd:");
        talloc_free(ctdb->ev);
        ctdb->ev = event_context_init(NULL);
 +      tevent_loop_allow_nesting(ctdb->ev);
  
        syslog(LOG_ERR, "Starting SYSLOG daemon with pid:%d", (int)getpid());
  

diff --cc ctdb/server/ctdb_monitor.c
Simple merge

diff --cc ctdb/server/ctdb_persistent.c
Simple merge

diff --cc ctdb/server/ctdb_recover.c
Simple merge

diff --cc ctdb/server/ctdb_recoverd.c
Simple merge

diff --cc ctdb/server/ctdb_takeover.c
Simple merge

diff --cc ctdb/server/ctdb_traverse.c
Simple merge

diff --cc ctdb/server/ctdb_vacuum.c
Simple merge

diff --cc ctdb/server/eventscript.c
Simple merge