[SCM] Samba Shared Repository - branch master updated

[Jeremy Allison]

The branch, master has been updated
       via  f6e3484 Re-arrange the optimization to reduce tdb fcntl calls if smbd is not clustered. procid_is_me() is much cheaper to test and can optimize up to 50% of the calls to serverid_exists(). Volker please check.
      from  c21c254 s3:passdb/py_passdb.c - restore Python >= 2.4 compatibility

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


- Log -----------------------------------------------------------------
commit f6e3484ba6350204cee0e0a85500b5ebb22fa4db
Author: Ira Cooper <ira at wakeful.net>
Date:   Fri Aug 19 10:32:29 2011 -0700

    Re-arrange the optimization to reduce tdb fcntl calls if smbd is not
    clustered. procid_is_me() is much cheaper to test and can optimize
    up to 50% of the calls to serverid_exists(). Volker please check.
    
    Autobuild-User: Jeremy Allison <jra at samba.org>
    Autobuild-Date: Sat Aug 20 01:15:07 CEST 2011 on sn-devel-104

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

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


Changeset truncated at 500 lines:

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


-- 
Samba Shared Repository