[SCM] Samba Shared Repository - branch master updated

[Jeremy Allison]

The branch, master has been updated
       via  5007ad3 s3: Slightly simplify serverid_exists
      from  3fc2bc3 s3-net: Added documentation for net_rpc_conf functions

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


- Log -----------------------------------------------------------------
commit 5007ad30265caa01d973c1964118a779c6ee68ef
Author: Volker Lendecke <vl at samba.org>
Date:   Mon Aug 22 10:21:09 2011 +0200

    s3: Slightly simplify serverid_exists
    
    procid_is_me() works fine in the clustering case as well
    
    Autobuild-User: Jeremy Allison <jra at samba.org>
    Autobuild-Date: Mon Aug 22 21:28:13 CEST 2011 on sn-devel-104

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

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


Changeset truncated at 500 lines:

diff --git a/source3/lib/serverid.c b/source3/lib/serverid.c
index d567066..7e56301 100644
--- a/source3/lib/serverid.c
+++ b/source3/lib/serverid.c
@@ -236,7 +236,7 @@ bool serverid_exists(const struct server_id *id)
 	struct serverid_key key;
 	TDB_DATA tdbkey;
 
-	if (!lp_clustering() && procid_is_me(id)) {
+	if (procid_is_me(id)) {
 		return true;
 	}
 


-- 
Samba Shared Repository