[SCM] Samba Shared Repository - branch master updated

Andrew Tridgell tridge at samba.org
Tue Oct 27 03:31:12 MDT 2009


The branch, master has been updated
       via  798b05a... s4-dsdb: call dsdb_make_schema_global() from ldb_wrap
      from  9a2112e... Second part of the fix for bug 6828 - infinite timeout occurs when byte lock held outside of samba. Fixes case where a connection with a pending lock can me marked "idle", and ensures that the lock queue timeout is always recalculated. Jeremy.

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


- Log -----------------------------------------------------------------
commit 798b05a9740f43b2b6f9a5091878d85e3c88409d
Author: Andrew Tridgell <tridge at samba.org>
Date:   Tue Oct 27 20:30:53 2009 +1100

    s4-dsdb: call dsdb_make_schema_global() from ldb_wrap
    
    Calling it from samdb_connect() can cause a stale schema to be put
    into the global schema.
    
    Thanks to Andrew Bartlett for spotting this.

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

Summary of changes:
 source4/dsdb/samdb/samdb.c |    1 -
 source4/lib/ldb_wrap.c     |    5 +++++
 2 files changed, 5 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/dsdb/samdb/samdb.c b/source4/dsdb/samdb/samdb.c
index 70f0409..b3ba633 100644
--- a/source4/dsdb/samdb/samdb.c
+++ b/source4/dsdb/samdb/samdb.c
@@ -133,7 +133,6 @@ struct ldb_context *samdb_connect(TALLOC_CTX *mem_ctx,
 	if (!ldb) {
 		return NULL;
 	}
-	dsdb_make_schema_global(ldb);
 	return ldb;
 }
 
diff --git a/source4/lib/ldb_wrap.c b/source4/lib/ldb_wrap.c
index ecd7bf4..134c227 100644
--- a/source4/lib/ldb_wrap.c
+++ b/source4/lib/ldb_wrap.c
@@ -248,6 +248,11 @@ struct ldb_context *ldb_wrap_connect(TALLOC_CTX *mem_ctx,
 
 	DLIST_ADD(ldb_wrap_list, w);
 
+	/* make the resulting schema global */
+	if (lp_ctx != NULL && strcmp(lp_sam_url(lp_ctx), url) == 0) {
+		dsdb_make_schema_global(ldb);
+	}
+
 	DEBUG(3,("ldb_wrap open of %s\n", url));
 
 	talloc_set_destructor(w, ldb_wrap_destructor);


-- 
Samba Shared Repository


More information about the samba-cvs mailing list