[SCM] Samba Shared Repository - branch v4-0-test updated - release-4-0-0alpha2-1346-g89458c7

[Andrew Bartlett]

The branch, v4-0-test has been updated
       via  89458c7d8b46cf5cf6c0dc514bb7e658f48c2adf (commit)
       via  d2b5f40d80008ca3269118915409333755b6eac3 (commit)
       via  1de21f5fdd9e377801af25b7ce461bdf7a16e1de (commit)
      from  8d4c831184cff8bca85daf6cc711b189b5cf3a47 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test


- Log -----------------------------------------------------------------
commit 89458c7d8b46cf5cf6c0dc514bb7e658f48c2adf
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Wed Mar 19 12:12:24 2008 +1100

    Extend the ldap.js test to prove faults with the LDAP backend.
    
    Try to provide more information to see why OpenLDAP isn't quite up to
    being a Samba4 Backend.
    
    Andrew Bartlett

commit d2b5f40d80008ca3269118915409333755b6eac3
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Wed Mar 19 12:06:37 2008 +1100

    Indent
    
    Andrew Bartlett

commit 1de21f5fdd9e377801af25b7ce461bdf7a16e1de
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Wed Mar 19 11:15:04 2008 +1100

    Remove unused variable.

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

Summary of changes:
 source/dsdb/samdb/ldb_modules/password_hash.c |    3 +-
 source/kdc/pac-glue.c                         |    1 -
 testprogs/ejs/ldap.js                         |   28 ++++++++++++++++++++----
 3 files changed, 25 insertions(+), 7 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/dsdb/samdb/ldb_modules/password_hash.c b/source/dsdb/samdb/ldb_modules/password_hash.c
index ec19e0d..1d2bdd9 100644
--- a/source/dsdb/samdb/ldb_modules/password_hash.c
+++ b/source/dsdb/samdb/ldb_modules/password_hash.c
@@ -1220,7 +1220,8 @@ static int build_domain_data_request(struct ph_context *ac)
 	ac->dom_req->op.search.base = ldb_get_default_basedn(ac->module->ldb);
 	ac->dom_req->op.search.scope = LDB_SCOPE_SUBTREE;
 
-	filter = talloc_asprintf(ac->dom_req, "(&(objectSid=%s)(|(|(objectClass=domain)(objectClass=builtinDomain))(objectClass=samba4LocalDomain)))", 
+	filter = talloc_asprintf(ac->dom_req,
+				 "(&(objectSid=%s)(|(|(objectClass=domain)(objectClass=builtinDomain))(objectClass=samba4LocalDomain)))", 
 				 ldap_encode_ndr_dom_sid(ac->dom_req, ac->domain_sid));
 	if (filter == NULL) {
 		ldb_debug(ac->module->ldb, LDB_DEBUG_ERROR, "Out of Memory!\n");
diff --git a/source/kdc/pac-glue.c b/source/kdc/pac-glue.c
index f65bd67..1c68d4c 100644
--- a/source/kdc/pac-glue.c
+++ b/source/kdc/pac-glue.c
@@ -227,7 +227,6 @@ static void samba_kdc_build_edata_reply(TALLOC_CTX *tmp_ctx, krb5_data *e_data,
 	unsigned char *buf;
 	size_t len;
 	krb5_error_code ret = 0;
-	uint32_t *tmp;
 
 	if (!e_data)
 		return;
diff --git a/testprogs/ejs/ldap.js b/testprogs/ejs/ldap.js
index c30f29e..44e4c83 100755
--- a/testprogs/ejs/ldap.js
+++ b/testprogs/ejs/ldap.js
@@ -866,12 +866,30 @@ member: cn=ldaptestuser4,cn=ldaptestcontainer," + base_dn + "
 	}
 
 	assert(res.msgs[0].dn == ("CN=ldaptestuser4,CN=ldaptestcontainer2," + base_dn));
-	assert(strupper(res.msgs[0].memberOf[0]) == strupper(("CN=ldaptestgroup2,CN=Users," + base_dn)));
+	assert(strupper(res.msgs[0].memberOf[0]) == (strupper("CN=ldaptestgroup2,CN=Users," + base_dn)));
 
-	println("Testing ldb.search for (&(member=CN=ldaptestuser4,CN=ldaptestcontainer2," + base_dn + ")(objectclass=group)) to check subtree renames and linked attributes");
-	var res = ldb.search("(&(member=CN=ldaptestuser4,CN=ldaptestcontainer2," + base_dn + ")(objectclass=group))", base_dn, ldb.SCOPE_SUBTREE);
+	println("Testing ldb.search for (&(cn=ldaptestgroup2)(objectClass=group)) in cn=users");
+	var res_group = ldb.search("(&(cn=ldaptestgroup2)(objectClass=group))", "cn=users," + base_dn, ldb.SCOPE_SUBTREE);
+	if (res_group.error != 0 || res_group.msgs.length != 1) {
+		println("Could not find (&(cn=ldaptestgroup2)(objectClass=group)) under cn=users," + base_dn);
+		assert(res_group.error == 0);
+		assert(res_group.msgs.length == 1);
+	}
+
+	println("Testing ldb.search for (member=CN=ldaptestuser4,CN=ldaptestcontainer2," + base_dn + ") to check subtree renames and linked attributes");
+	var res = ldb.search("(member=CN=ldaptestuser4,CN=ldaptestcontainer2," + base_dn + ")", base_dn, ldb.SCOPE_SUBTREE);
 	if (res.error != 0 || res.msgs.length != 1) {
-		println("Could not find (&(member=CN=ldaptestuser4,CN=ldaptestcontainer2," + base_dn + ")(objectclass=group)), perhaps linked attributes are not conistant with subtree renames?");
+		for (i=0; i < res_group.msgs[0].member.length; i++) {
+		    println("res_group.member[" +  i + "]: " + res_group.msgs[0].member[i]);
+		}
+
+		println("Could not find (member=CN=ldaptestuser4,CN=ldaptestcontainer2," + base_dn + "), perhaps linked attributes are not conistant with subtree renames?");
+		println("Testing ldb.search for (member=CN=ldaptestuser4,CN=ldaptestcontainer," + base_dn + ") to check if it just hasn't been updated");
+		var res2 = ldb.search("(member=CN=ldaptestuser4,CN=ldaptestcontainer," + base_dn + ")", base_dn, ldb.SCOPE_SUBTREE);
+		if (res2.error != 0 || res2.msgs.length != 1) {
+			println("Could not find (member=CN=ldaptestuser4,CN=ldaptestcontainer," + base_dn + "), very odd, it wasn't here at all..");
+		}
+
 		assert(res.error == 0);
 		assert(res.msgs.length == 1);
 	}
@@ -992,7 +1010,7 @@ objectClass: user
 	assert(res.msgs[0].objectCategory == ("CN=Person,CN=Schema,CN=Configuration," + base_dn));
 	assert(res.msgs[0].sAMAccountType == 805306368);
 	assert(res.msgs[0].userAccountControl == 546);
-	assert(res.msgs[0].memberOf[0] == ("CN=ldaptestgroup2,CN=Users," + base_dn));
+	assert(strupper(res.msgs[0].memberOf[0]) == strupper("CN=ldaptestgroup2,CN=Users," + base_dn));
 	assert(res.msgs[0].memberOf.length == 1);
  
 	println("Testing ldb.search for (&(cn=ldaptestuser)(objectCategory=cn=person,cn=schema,cn=configuration," + base_dn + "))");


-- 
Samba Shared Repository