Author: metze Date: 2007-08-01 10:03:13 +0000 (Wed, 01 Aug 2007) New Revision: 24113
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=24113 Log: some little fixes to get the correct error message when using "clustering = yes" and ctdbd isn't running metze Modified: branches/SAMBA_3_2/source/lib/dbwrap_ctdb.c branches/SAMBA_3_2/source/lib/messages_ctdbd.c Changeset: Modified: branches/SAMBA_3_2/source/lib/dbwrap_ctdb.c =================================================================== --- branches/SAMBA_3_2/source/lib/dbwrap_ctdb.c 2007-08-01 04:05:06 UTC (rev 24112) +++ branches/SAMBA_3_2/source/lib/dbwrap_ctdb.c 2007-08-01 10:03:13 UTC (rev 24113) @@ -363,7 +363,11 @@ } if (ctx->conn == NULL) { - ctdbd_init_connection(ctx, &ctx->conn); + NTSTATUS status; + status = ctdbd_init_connection(ctx, &ctx->conn); + if (!NT_STATUS_IS_OK(status)) { + return NULL; + } set_my_vnn(ctdbd_vnn(ctx->conn)); } Modified: branches/SAMBA_3_2/source/lib/messages_ctdbd.c =================================================================== --- branches/SAMBA_3_2/source/lib/messages_ctdbd.c 2007-08-01 04:05:06 UTC (rev 24112) +++ branches/SAMBA_3_2/source/lib/messages_ctdbd.c 2007-08-01 10:03:13 UTC (rev 24113) @@ -88,7 +88,7 @@ status = ctdbd_messaging_connection(ctx, &ctx->conn); if (!NT_STATUS_IS_OK(status)) { - DEBUG(10, ("ctdbd_init_connection failed: %s\n", + DEBUG(10, ("ctdbd_messaging_connection failed: %s\n", nt_errstr(status))); TALLOC_FREE(result); return status;
