The branch, v4-0-test has been updated
via d8a805a2544c8864136f77e9086b2a01ae79a1d5 (commit)
via b0657e068148eb0e5f1d69d125faaa29acb8d379 (commit)
via 89053bc564f1d736da48fbe20e7f8f244b0c67fa (commit)
via 9b47b551a3762590fefa5308310d91c6d8b378e5 (commit)
via fc57a119f53a7bc0a0eb76b868bbd7386b3c5008 (commit)
from 9cff25cce1d39460dbcab006a309bb2984969eed (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test
- Log -----------------------------------------------------------------
commit d8a805a2544c8864136f77e9086b2a01ae79a1d5
Merge: b0657e068148eb0e5f1d69d125faaa29acb8d379
9cff25cce1d39460dbcab006a309bb2984969eed
Author: Andrew Bartlett <[EMAIL PROTECTED]>
Date: Wed Jan 16 09:00:04 2008 +1100
Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-local
commit b0657e068148eb0e5f1d69d125faaa29acb8d379
Author: Andrew Bartlett <[EMAIL PROTECTED]>
Date: Wed Jan 16 08:59:13 2008 +1100
Make the Fedora DS LDAP backend 'aci' actually work, with better quoting.
Andrew Bartlett
commit 89053bc564f1d736da48fbe20e7f8f244b0c67fa
Author: Andrew Bartlett <[EMAIL PROTECTED]>
Date: Wed Jan 16 08:58:07 2008 +1100
Test the behaviour of mixed domain_scope and search_options controls.
Andrew Bartlett
commit 9b47b551a3762590fefa5308310d91c6d8b378e5
Author: Andrew Bartlett <[EMAIL PROTECTED]>
Date: Wed Jan 16 08:57:28 2008 +1100
Make ldap.js test easier to re-run in failure cases, by deleting more
things that we will create later.
Andrew Bartlett
commit fc57a119f53a7bc0a0eb76b868bbd7386b3c5008
Author: Andrew Bartlett <[EMAIL PROTECTED]>
Date: Wed Jan 16 08:49:54 2008 +1100
Rework control handling to remove the 'domain_scope' control
Also remove the search_options control earlier, before, rather than
after duplicating the request.
When we generate referalls in the partition module, the domain_scope
control with suppress them.
Andrew Bartlett
-----------------------------------------------------------------------
Summary of changes:
source/dsdb/samdb/ldb_modules/partition.c | 54 ++++++++++++++++++++---------
source/selftest/env/Samba4.pm | 2 +-
testprogs/blackbox/test_ldb.sh | 7 ++++
testprogs/ejs/ldap.js | 7 +++-
4 files changed, 51 insertions(+), 19 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/dsdb/samdb/ldb_modules/partition.c
b/source/dsdb/samdb/ldb_modules/partition.c
index 4586810..61b6444 100644
--- a/source/dsdb/samdb/ldb_modules/partition.c
+++ b/source/dsdb/samdb/ldb_modules/partition.c
@@ -169,13 +169,12 @@ static int partition_other_callback(struct ldb_context
*ldb, void *context, stru
}
-static int partition_send_request(struct partition_context *ac, struct
ldb_control *remove_control,
+static int partition_send_request(struct partition_context *ac,
struct dsdb_control_current_partition
*partition)
{
int ret;
struct ldb_module *backend;
struct ldb_request *req;
- struct ldb_control **saved_controls;
if (partition) {
backend = make_module_for_next_request(ac, ac->module->ldb,
partition->module);
@@ -225,12 +224,6 @@ static int partition_send_request(struct partition_context
*ac, struct ldb_contr
req->context = ac;
}
- /* Remove a control, so we don't confuse a backend server */
- if (remove_control && !save_controls(remove_control, req,
&saved_controls)) {
- ldb_oom(ac->module->ldb);
- return LDB_ERR_OPERATIONS_ERROR;
- }
-
if (partition) {
ret = ldb_request_add_control(req,
DSDB_CONTROL_CURRENT_PARTITION_OID, false, partition);
if (ret != LDB_SUCCESS) {
@@ -253,18 +246,17 @@ static int partition_send_request(struct
partition_context *ac, struct ldb_contr
*/
static int partition_send_all(struct ldb_module *module,
struct partition_context *ac,
- struct ldb_control *remove_control,
struct ldb_request *req)
{
int i;
struct partition_private_data *data =
talloc_get_type(module->private_data,
struct
partition_private_data);
- int ret = partition_send_request(ac, remove_control, NULL);
+ int ret = partition_send_request(ac, NULL);
if (ret != LDB_SUCCESS) {
return ret;
}
for (i=0; data && data->partitions && data->partitions[i]; i++) {
- ret = partition_send_request(ac, remove_control,
data->partitions[i]);
+ ret = partition_send_request(ac, data->partitions[i]);
if (ret != LDB_SUCCESS) {
return ret;
}
@@ -297,7 +289,7 @@ static int partition_replicate(struct ldb_module *module,
struct ldb_request *re
return LDB_ERR_OPERATIONS_ERROR;
}
- return partition_send_all(module, ac, NULL,
req);
+ return partition_send_all(module, ac, req);
}
}
}
@@ -314,6 +306,7 @@ static int partition_replicate(struct ldb_module *module,
struct ldb_request *re
* TODO: we should maybe return an error here
* if it's not a special dn
*/
+
return ldb_next_request(module, req);
}
@@ -334,6 +327,8 @@ static int partition_replicate(struct ldb_module *module,
struct ldb_request *re
/* search */
static int partition_search(struct ldb_module *module, struct ldb_request *req)
{
+ struct ldb_control **saved_controls;
+
/* Find backend */
struct partition_private_data *data =
talloc_get_type(module->private_data,
struct
partition_private_data);
@@ -342,19 +337,34 @@ static int partition_search(struct ldb_module *module,
struct ldb_request *req)
/* (later) consider if we should be searching multiple
* partitions (for 'invisible' partition behaviour */
struct ldb_control *search_control = ldb_request_get_control(req,
LDB_CONTROL_SEARCH_OPTIONS_OID);
+ struct ldb_control *domain_scope_control = ldb_request_get_control(req,
LDB_CONTROL_DOMAIN_SCOPE_OID);
struct ldb_search_options_control *search_options = NULL;
if (search_control) {
search_options = talloc_get_type(search_control->data, struct
ldb_search_options_control);
}
+ /* Remove the domain_scope control, so we don't confuse a backend
server */
+ if (domain_scope_control && !save_controls(domain_scope_control, req,
&saved_controls)) {
+ ldb_oom(module->ldb);
+ return LDB_ERR_OPERATIONS_ERROR;
+ }
+
+ /* TODO:
+ Generate referrals (look for a partition under this DN) if we don't
have the above control specified
+ */
+
if (search_options && (search_options->search_options &
LDB_SEARCH_OPTION_PHANTOM_ROOT)) {
int ret, i;
struct partition_context *ac;
- struct ldb_control *remove_control = NULL;
if ((search_options->search_options &
~LDB_SEARCH_OPTION_PHANTOM_ROOT) == 0) {
/* We have processed this flag, so we are done with
this control now */
- remove_control = search_control;
+
+ /* Remove search control, so we don't confuse a backend
server */
+ if (search_control && !save_controls(search_control,
req, &saved_controls)) {
+ ldb_oom(module->ldb);
+ return LDB_ERR_OPERATIONS_ERROR;
+ }
}
ac = partition_init_handle(req, module);
if (!ac) {
@@ -363,12 +373,12 @@ static int partition_search(struct ldb_module *module,
struct ldb_request *req)
/* Search from the base DN */
if (!req->op.search.base ||
ldb_dn_is_null(req->op.search.base)) {
- return partition_send_all(module, ac, remove_control,
req);
+ return partition_send_all(module, ac, req);
}
for (i=0; data && data->partitions && data->partitions[i]; i++)
{
/* Find all partitions under the search base */
if (ldb_dn_compare_base(req->op.search.base,
data->partitions[i]->dn) == 0) {
- ret = partition_send_request(ac,
remove_control, data->partitions[i]);
+ ret = partition_send_request(ac,
data->partitions[i]);
if (ret != LDB_SUCCESS) {
return ret;
}
@@ -384,6 +394,16 @@ static int partition_search(struct ldb_module *module,
struct ldb_request *req)
return LDB_SUCCESS;
} else {
/* Handle this like all other requests */
+ if (search_control && (search_options->search_options &
~LDB_SEARCH_OPTION_PHANTOM_ROOT) == 0) {
+ /* We have processed this flag, so we are done with
this control now */
+
+ /* Remove search control, so we don't confuse a backend
server */
+ if (search_control && !save_controls(search_control,
req, &saved_controls)) {
+ ldb_oom(module->ldb);
+ return LDB_ERR_OPERATIONS_ERROR;
+ }
+ }
+
return partition_replicate(module, req, req->op.search.base);
}
}
@@ -693,7 +713,7 @@ static int partition_extended(struct ldb_module *module,
struct ldb_request *req
return LDB_ERR_OPERATIONS_ERROR;
}
- return partition_send_all(module, ac, NULL, req);
+ return partition_send_all(module, ac, req);
}
static int sort_compare(void *void1,
diff --git a/source/selftest/env/Samba4.pm b/source/selftest/env/Samba4.pm
index 61edeb3..dc084ae 100644
--- a/source/selftest/env/Samba4.pm
+++ b/source/selftest/env/Samba4.pm
@@ -712,7 +712,7 @@ nogroup:x:65534:nobody
} elsif ($self->{ldap} eq "fedora-ds") {
($ret->{FEDORA_DS_DIR}, $ret->{FEDORA_DS_PIDFILE}) =
$self->mk_fedora_ds($ldapdir, $configuration) or die("Unable to create fedora
ds directories");
push (@provision_options, "--ldap-module=nsuniqueid");
- push (@provision_options, "--aci=aci::
KHRhcmdldGF0dHIgPSAiKiIpICh2ZXJzaW9uIDMuMDthY2wgImZ1bGwgYWNjZXNzIHRvIGFsbCBieSBhbGwiO2FsbG93IChhbGwpKHVzZXJkbiA9ICJsZGFwOi8vL2FueW9uZSIpOykK");
+ push (@provision_options, "'--aci=aci::
KHRhcmdldGF0dHIgPSAiKiIpICh2ZXJzaW9uIDMuMDthY2wgImZ1bGwgYWNjZXNzIHRvIGFsbCBieSBhbGwiO2FsbG93IChhbGwpKHVzZXJkbiA9ICJsZGFwOi8vL2FueW9uZSIpOykK'");
}
$self->slapd_start($ret) or
diff --git a/testprogs/blackbox/test_ldb.sh b/testprogs/blackbox/test_ldb.sh
index e35d354..4067a7f 100755
--- a/testprogs/blackbox/test_ldb.sh
+++ b/testprogs/blackbox/test_ldb.sh
@@ -108,5 +108,12 @@ echo "Search Options Control Query test returned 0 items"
failed=`expr $failed + 1`
fi
+echo "Test Search Options Control with Domain Scope Control"
+nentries=`bin/ldbsearch $options $CONFIGURATION -H $p://$SERVER
--controls=search_options:1:2,domain_scope:1 '(objectclass=crossRef)' | grep
crossRef | wc -l`
+if [ $nentries -lt 1 ]; then
+echo "Search Options Control Query test returned 0 items"
+failed=`expr $failed + 1`
+fi
+
exit $failed
diff --git a/testprogs/ejs/ldap.js b/testprogs/ejs/ldap.js
index c03dbe9..836b726 100755
--- a/testprogs/ejs/ldap.js
+++ b/testprogs/ejs/ldap.js
@@ -30,7 +30,12 @@ function basic_tests(ldb, gc_ldb, base_dn, configuration_dn,
schema_dn)
println("Running basic tests");
ldb.del("cn=ldaptestuser,cn=users," + base_dn);
-
+ ldb.del("cn=ldaptestuser2,cn=users," + base_dn);
+ ldb.del("cn=ldaptestuser3,cn=users," + base_dn);
+ ldb.del("cn=ldaptestuser4,cn=users," + base_dn);
+ ldb.del("cn=ldaptestuser5,cn=users," + base_dn);
+ ldb.del("CN=ldaptestuser4,CN=ldaptestcontainer2," + base_dn);
+ ldb.del("CN=ldaptestcontainer2," + base_dn);
ldb.del("cn=ldaptestgroup,cn=users," + base_dn);
println("Testing group add with invalid member");
--
Samba Shared Repository
