don't use stderr here - rely on logging

(This used to be ctdb commit a2a3b254b22dbaafc8c4934d99cc67d6ae4adbd1)

diff --git a/ctdb/common/ctdb_util.c b/ctdb/common/ctdb_util.c
index e77dc8990d7fc60d2d0494dc6bdc73ea40ef4a1f..b74162bb3f5da60a421d5931117e3437f35ac26e 100644 (file)
--- a/ctdb/common/ctdb_util.c
+++ b/ctdb/common/ctdb_util.c
@@ -55,7 +55,6 @@ void ctdb_set_error(struct ctdb_context *ctdb, const char *fmt, ...)
 void ctdb_fatal(struct ctdb_context *ctdb, const char *msg)
 {
        DEBUG(0,("ctdb fatal error: %s\n", msg));
-       fprintf(stderr, "ctdb fatal error: '%s'\n", msg);
        abort();
 }
 

diff --git a/ctdb/direct/ctdbd.c b/ctdb/direct/ctdbd.c
index c5b852ae2174577aebdcf0626cc02b82f7f1693b..bf30ad86d6d2f73a0f25ccb853ebe9b9dd7d53a3 100644 (file)
--- a/ctdb/direct/ctdbd.c
+++ b/ctdb/direct/ctdbd.c
@@ -86,7 +86,8 @@ int main(int argc, const char *argv[])
 
        /* useful default logfile */
        if (ctdb->logfile == NULL) {
-               char *name = talloc_asprintf(ctdb, "%s/log.ctdb.%u", VARDIR, ctdb->vnn);
+               char *name = talloc_asprintf(ctdb, "%s/log.ctdb.vnn%u", 
+                                            VARDIR, ctdb->vnn);
                ctdb_set_logfile(ctdb, name);
                talloc_free(name);
        }