[SCM] Samba Shared Repository - branch master updated

[Günther Deschner]

The branch, master has been updated
       via  cf57fd4 s3-ctdb: fix the build w/o HAVE_CTDB_CONTROL_CHECK_SRVIDS_DECL
      from  763fe42 s3:smb2_server: use sconn->ev_ctx instead of sconn->smb2.event_ctx

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit cf57fd44d7b800f09dac1485812b98d881ee48d6
Author: Günther Deschner <gd at samba.org>
Date:   Mon Dec 12 12:17:35 2011 +0100

    s3-ctdb: fix the build w/o HAVE_CTDB_CONTROL_CHECK_SRVIDS_DECL
    
    Volker, please check.
    
    Guenther
    
    Autobuild-User: Günther Deschner <gd at samba.org>
    Autobuild-Date: Mon Dec 12 17:42:29 CET 2011 on sn-devel-104

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

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


Changeset truncated at 500 lines:

diff --git a/source3/lib/ctdbd_conn.c b/source3/lib/ctdbd_conn.c
index 940d477..9d4af18 100644
--- a/source3/lib/ctdbd_conn.c
+++ b/source3/lib/ctdbd_conn.c
@@ -1117,6 +1117,8 @@ fail:
 	return false;
 }
 
+#ifdef HAVE_CTDB_CONTROL_CHECK_SRVIDS_DECL
+
 bool ctdb_serverids_exist(struct ctdbd_connection *conn,
 			  const struct server_id *pids, unsigned num_pids,
 			  bool *results)
@@ -1240,6 +1242,8 @@ fail:
 	return result;
 }
 
+#endif /* HAVE_CTDB_CONTROL_CHECK_SRVIDS_DECL */
+
 /*
  * Get a db path
  */


-- 
Samba Shared Repository