[SCM] Samba Shared Repository - branch v3-4-test updated - release-4-0-0alpha7-868-g7ad42cc

[Volker Lendecke]

The branch, v3-4-test has been updated
       via  7ad42cc74322a1435c9cce9b286b13cd9b490ec6 (commit)
      from  8c7afce8bb86cda773c713459bb18233dc4848a3 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-test


- Log -----------------------------------------------------------------
commit 7ad42cc74322a1435c9cce9b286b13cd9b490ec6
Author: Volker Lendecke <vl at samba.org>
Date:   Mon May 4 14:39:56 2009 +0200

    Do not crash in ctdbd_traverse if ctdbd is not around

-----------------------------------------------------------------------

Summary of changes:
 source3/lib/ctdbd_conn.c |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/lib/ctdbd_conn.c b/source3/lib/ctdbd_conn.c
index 88d82ca..dde3775 100644
--- a/source3/lib/ctdbd_conn.c
+++ b/source3/lib/ctdbd_conn.c
@@ -1101,6 +1101,11 @@ NTSTATUS ctdbd_traverse(uint32 db_id,
 	struct ctdbd_traverse_state state;
 
 	status = ctdbd_init_connection(NULL, &conn);
+	if (!NT_STATUS_IS_OK(status)) {
+		DEBUG(0, ("ctdbd_init_connection failed: %s\n",
+			  nt_errstr(status)));
+		return status;
+	}
 
 	t.db_id = db_id;
 	t.srvid = conn->rand_srvid;


-- 
Samba Shared Repository