[SCM] Samba Shared Repository - branch master updated
Andrew Bartlett
abartlet at samba.org
Mon Oct 18 05:55:01 MDT 2010
The branch, master has been updated
via 034832c s4-ldb Add LDB_REQ_SET_LOCATION to help track handler use
via f4c82c6 s4-selftest Make GDB_PROVISION work again
via 48c54f9 ldb Ensure we mark ongoing LDAP requests as PENDING
via ce01e36 s4-openldap-backend Don't set 'dbnosync' on cn=config
via ba9e787 s4-provision Use --ldap-backend-nosync rather than just --nosync
from d1ca35c heimdal_build: Add dependency on com_err to HEIMDAL_CONFIG.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 034832ccd5f32658f8f199d277878985e5c65470
Author: Andrew Bartlett <abartlet at samba.org>
Date: Mon Oct 18 22:13:20 2010 +1100
s4-ldb Add LDB_REQ_SET_LOCATION to help track handler use
This greatly assists in debugging what is going on with the
ldb handle, as it indicates where it was created.
Andrew Bartlett
Autobuild-User: Andrew Bartlett <abartlet at samba.org>
Autobuild-Date: Mon Oct 18 11:54:46 UTC 2010 on sn-devel-104
commit f4c82c621de73bdaee7a4a9e8598ea41ec208256
Author: Andrew Bartlett <abartlet at samba.org>
Date: Mon Oct 18 22:11:40 2010 +1100
s4-selftest Make GDB_PROVISION work again
gdb --args won't run the #!/usr/bin/evn python
Andrew Bartlett
commit 48c54f9ec879b5ffedfe91d52202bff3d2ef1eff
Author: Andrew Bartlett <abartlet at samba.org>
Date: Mon Oct 18 14:06:50 2010 +1100
ldb Ensure we mark ongoing LDAP requests as PENDING
commit ce01e36d8c2e3b9857d64a648fdf683c0c267bd6
Author: Andrew Bartlett <abartlet at samba.org>
Date: Mon Oct 18 11:49:55 2010 +1100
s4-openldap-backend Don't set 'dbnosync' on cn=config
This isn't valid in current OpenLDAP versions.
Andrew Bartlett
commit ba9e787c7d51ab7b381361e02efad97c5814d3c7
Author: Andrew Bartlett <abartlet at samba.org>
Date: Mon Oct 18 11:48:14 2010 +1100
s4-provision Use --ldap-backend-nosync rather than just --nosync
For some reason we had both options, and --ldap-backend-nosync is
the better name.
Andrew Bartlett
-----------------------------------------------------------------------
Summary of changes:
selftest/target/Samba4.pm | 8 ++++++++
source4/lib/ldb/ldb_ildap/ldb_ildap.c | 2 ++
source4/lib/ldb/ldb_map/ldb_map.c | 2 ++
source4/lib/ldb/ldb_map/ldb_map_inbound.c | 9 +++++++++
source4/lib/ldb/ldb_map/ldb_map_outbound.c | 1 +
source4/lib/ldb/modules/paged_searches.c | 2 ++
source4/setup/provision | 3 +--
source4/setup/slapd.conf | 1 -
8 files changed, 25 insertions(+), 3 deletions(-)
Changeset truncated at 500 lines:
diff --git a/selftest/target/Samba4.pm b/selftest/target/Samba4.pm
index 574c015..ba96f08 100644
--- a/selftest/target/Samba4.pm
+++ b/selftest/target/Samba4.pm
@@ -529,9 +529,17 @@ sub provision_raw_prepare($$$$$$$$$$)
push (@provision_options, "NSS_WRAPPER_GROUP=\"$ctx->{nsswrap_group}\"");
if (defined($ENV{GDB_PROVISION})) {
push (@provision_options, "gdb --args");
+ if (!defined($ENV{PYTHON})) {
+ push (@provision_options, "env");
+ push (@provision_options, "python");
+ }
}
if (defined($ENV{VALGRIND_PROVISION})) {
push (@provision_options, "valgrind");
+ if (!defined($ENV{PYTHON})) {
+ push (@provision_options, "env");
+ push (@provision_options, "python");
+ }
}
if (defined($ENV{PYTHON})) {
push (@provision_options, $ENV{PYTHON});
diff --git a/source4/lib/ldb/ldb_ildap/ldb_ildap.c b/source4/lib/ldb/ldb_ildap/ldb_ildap.c
index 98e98a8..774336b 100644
--- a/source4/lib/ldb/ldb_ildap/ldb_ildap.c
+++ b/source4/lib/ldb/ldb_ildap/ldb_ildap.c
@@ -404,6 +404,8 @@ static int ildb_request_send(struct ildb_context *ac, struct ldap_message *msg)
ldb = ldb_module_get_ctx(ac->module);
+ ldb_request_set_state(ac->req, LDB_ASYNC_PENDING);
+
req = ldap_request_send(ac->ildb->ldap, msg);
if (req == NULL) {
ldb_set_errstring(ldb, "async send request failed");
diff --git a/source4/lib/ldb/ldb_map/ldb_map.c b/source4/lib/ldb/ldb_map/ldb_map.c
index 483222e..61d0d4c 100644
--- a/source4/lib/ldb/ldb_map/ldb_map.c
+++ b/source4/lib/ldb/ldb_map/ldb_map.c
@@ -891,6 +891,7 @@ struct ldb_request *map_search_base_req(struct map_context *ac, struct ldb_dn *d
NULL,
context, callback,
ac->req);
+ LDB_REQ_SET_LOCATION(req);
if (ret != LDB_SUCCESS) {
return NULL;
}
@@ -938,6 +939,7 @@ struct ldb_request *map_build_fixup_req(struct map_context *ac,
ac, msg, NULL,
context, callback,
ac->req);
+ LDB_REQ_SET_LOCATION(req);
if (ret != LDB_SUCCESS) {
goto failed;
}
diff --git a/source4/lib/ldb/ldb_map/ldb_map_inbound.c b/source4/lib/ldb/ldb_map/ldb_map_inbound.c
index cdc88af..83eec1d 100644
--- a/source4/lib/ldb/ldb_map/ldb_map_inbound.c
+++ b/source4/lib/ldb/ldb_map/ldb_map_inbound.c
@@ -414,6 +414,7 @@ int map_add(struct ldb_module *module, struct ldb_request *req)
req->controls,
ac, map_op_remote_callback,
req);
+ LDB_REQ_SET_LOCATION(ac->remote_req);
if (ret != LDB_SUCCESS) {
return LDB_ERR_OPERATIONS_ERROR;
}
@@ -451,6 +452,7 @@ static int map_add_do_local(struct map_context *ac)
ac,
map_op_local_callback,
ac->req);
+ LDB_REQ_SET_LOCATION(local_req);
if (ret != LDB_SUCCESS) {
return LDB_ERR_OPERATIONS_ERROR;
}
@@ -522,6 +524,7 @@ int map_modify(struct ldb_module *module, struct ldb_request *req)
req->controls,
ac, map_op_remote_callback,
req);
+ LDB_REQ_SET_LOCATION(ac->remote_req);
if (ret != LDB_SUCCESS) {
return LDB_ERR_OPERATIONS_ERROR;
}
@@ -571,6 +574,7 @@ static int map_modify_do_local(struct map_context *ac)
ac,
map_op_local_callback,
ac->req);
+ LDB_REQ_SET_LOCATION(local_req);
if (ret != LDB_SUCCESS) {
return LDB_ERR_OPERATIONS_ERROR;
}
@@ -582,6 +586,7 @@ static int map_modify_do_local(struct map_context *ac)
ac,
map_op_local_callback,
ac->req);
+ LDB_REQ_SET_LOCATION(local_req);
if (ret != LDB_SUCCESS) {
return LDB_ERR_OPERATIONS_ERROR;
}
@@ -628,6 +633,7 @@ int map_delete(struct ldb_module *module, struct ldb_request *req)
ac,
map_op_remote_callback,
req);
+ LDB_REQ_SET_LOCATION(ac->remote_req);
if (ret != LDB_SUCCESS) {
return LDB_ERR_OPERATIONS_ERROR;
}
@@ -670,6 +676,7 @@ static int map_delete_do_local(struct map_context *ac)
ac,
map_op_local_callback,
ac->req);
+ LDB_REQ_SET_LOCATION(local_req);
if (ret != LDB_SUCCESS) {
return LDB_ERR_OPERATIONS_ERROR;
}
@@ -721,6 +728,7 @@ int map_rename(struct ldb_module *module, struct ldb_request *req)
req->controls,
ac, map_op_remote_callback,
req);
+ LDB_REQ_SET_LOCATION(ac->remote_req);
if (ret != LDB_SUCCESS) {
return LDB_ERR_OPERATIONS_ERROR;
}
@@ -764,6 +772,7 @@ static int map_rename_do_local(struct map_context *ac)
ac,
map_rename_local_callback,
ac->req);
+ LDB_REQ_SET_LOCATION(local_req);
if (ret != LDB_SUCCESS) {
return LDB_ERR_OPERATIONS_ERROR;
}
diff --git a/source4/lib/ldb/ldb_map/ldb_map_outbound.c b/source4/lib/ldb/ldb_map/ldb_map_outbound.c
index 40be94c..ebed0d2 100644
--- a/source4/lib/ldb/ldb_map/ldb_map_outbound.c
+++ b/source4/lib/ldb/ldb_map/ldb_map_outbound.c
@@ -1208,6 +1208,7 @@ int map_search(struct ldb_module *module, struct ldb_request *req)
req->controls,
ac, map_remote_search_callback,
req);
+ LDB_REQ_SET_LOCATION(remote_req);
if (ret != LDB_SUCCESS) {
return LDB_ERR_OPERATIONS_ERROR;
}
diff --git a/source4/lib/ldb/modules/paged_searches.c b/source4/lib/ldb/modules/paged_searches.c
index 39780cb..bd2ea09 100644
--- a/source4/lib/ldb/modules/paged_searches.c
+++ b/source4/lib/ldb/modules/paged_searches.c
@@ -270,6 +270,7 @@ static int ps_search(struct ldb_module *module, struct ldb_request *req)
ac,
ps_callback,
ac->req);
+ LDB_REQ_SET_LOCATION(ac->down_req);
if (ret != LDB_SUCCESS) {
return ret;
}
@@ -351,6 +352,7 @@ static int ps_init(struct ldb_module *module)
attrs, NULL,
data, check_supported_paged,
NULL);
+ LDB_REQ_SET_LOCATION(req);
if (ret != LDB_SUCCESS) {
return ret;
}
diff --git a/source4/setup/provision b/source4/setup/provision
index 035fa2a..21d94cb 100755
--- a/source4/setup/provision
+++ b/source4/setup/provision
@@ -115,7 +115,6 @@ parser.add_option("--slapd-path", type="string", metavar="SLAPD-PATH",
help="Path to slapd for LDAP backend [e.g.:'/usr/local/libexec/slapd']. Required for Setup with LDAP-Backend. OpenLDAP Version >= 2.4.17 should be used.")
parser.add_option("--setup-ds-path", type="string", metavar="SETUP_DS-PATH",
help="Path to setup-ds.pl script for Fedora DS LDAP backend [e.g.:'/usr/sbin/setup-ds.pl']. Required for Setup with Fedora DS backend.")
-parser.add_option("--nosync", help="Configure LDAP backend not to call fsync() (for performance in test environments)", action="store_true")
parser.add_option("--use-xattrs", type="choice", choices=["yes","no","auto"], help="Define if we should use the native fs capabilities or a tdb file for storing attributes likes ntacl, auto tries to make an inteligent guess based on the user rights and system capabilities", default="auto")
parser.add_option("--ldap-dryrun-mode", help="Configure LDAP backend, but do not run any binaries and exit early. Used only for the test environment. DO NOT USE", action="store_true")
@@ -249,7 +248,7 @@ try:
backend_type=opts.ldap_backend_type,
ldapadminpass=opts.ldapadminpass, ol_mmr_urls=opts.ol_mmr_urls,
slapd_path=opts.slapd_path, setup_ds_path=opts.setup_ds_path,
- nosync=opts.nosync, ldap_dryrun_mode=opts.ldap_dryrun_mode,
+ nosync=opts.ldap_backend_nosync, ldap_dryrun_mode=opts.ldap_dryrun_mode,
useeadb=eadb, next_rid=opts.next_rid)
except ProvisioningError, e:
print str(e)
diff --git a/source4/setup/slapd.conf b/source4/setup/slapd.conf
index 3aacb11..c2d92ec 100644
--- a/source4/setup/slapd.conf
+++ b/source4/setup/slapd.conf
@@ -73,7 +73,6 @@ rootdn cn=config
${OLC_SYNCREPL_CONFIG}
${OLC_MMR_CONFIG}
-${NOSYNC}
access to dn.sub="cn=config"
by dn="cn=samba-admin,cn=samba" write
--
Samba Shared Repository
More information about the samba-cvs
mailing list