[SCM] Samba Shared Repository - branch v4-0-test updated - release-4-0-0alpha2-463-gc4aba5a

[Andrew Bartlett]

The branch, v4-0-test has been updated
       via  c4aba5ad01f5095ad7a9d0d0f1e3c6afedbbd9b7 (commit)
       via  f7f765c29b1aca1179a47bdd8712917c3f244f15 (commit)
      from  d8a805a2544c8864136f77e9086b2a01ae79a1d5 (commit)

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


- Log -----------------------------------------------------------------
commit c4aba5ad01f5095ad7a9d0d0f1e3c6afedbbd9b7
Merge: f7f765c29b1aca1179a47bdd8712917c3f244f15 d8a805a2544c8864136f77e9086b2a01ae79a1d5
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Wed Jan 16 09:26:24 2008 +1100

    Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-abartlet

commit f7f765c29b1aca1179a47bdd8712917c3f244f15
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Wed Jan 16 09:26:14 2008 +1100

    Start generating a configuration for the refint overlay.  This
    OpenLDAP module should ensure that after a subtree rename, attributes
    are still consistant.
    
    Andrew Bartlett

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

Summary of changes:
 source/selftest/env/Samba4.pm  |    6 ++++++
 source/setup/provision-backend |    7 +++++++
 2 files changed, 13 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/selftest/env/Samba4.pm b/source/selftest/env/Samba4.pm
index dc084ae..87a86ef 100644
--- a/source/selftest/env/Samba4.pm
+++ b/source/selftest/env/Samba4.pm
@@ -244,6 +244,7 @@ sub mk_openldap($$$)
 modulepath      $olroot/libexec/openldap
 moduleload	syncprov
 moduleload      memberof
+moduleload      refint
 ";
 		close(CONF);
 	}
@@ -255,6 +256,7 @@ modulepath      $olroot/libexec/openldap
 moduleload	back_hdb
 moduleload	syncprov
 moduleload      memberof
+moduleload      refint
 ";
 		close(CONF);
 	}
@@ -266,6 +268,7 @@ moduleload      memberof
 moduleload	back_hdb
 moduleload	syncprov
 moduleload      memberof
+moduleload      refint
 ";
 		close(CONF);
 	}
@@ -278,6 +281,7 @@ modulepath	/usr/lib/ldap
 moduleload	back_hdb
 moduleload	syncprov
 moduleload      memberof
+moduleload      refint
 ";
 		close(CONF);
 	}
@@ -289,6 +293,7 @@ moduleload      memberof
 modulepath	/usr/lib/openldap
 moduleload	syncprov
 moduleload      memberof
+moduleload      refint
 ";
 		close(CONF);
 	}
@@ -300,6 +305,7 @@ moduleload      memberof
 modulepath	/usr/lib64/openldap
 moduleload	syncprov
 moduleload      memberof
+moduleload      refint
 ";
 		close(CONF);
 	}
diff --git a/source/setup/provision-backend b/source/setup/provision-backend
index 66555c4..ba9e67f 100755
--- a/source/setup/provision-backend
+++ b/source/setup/provision-backend
@@ -151,10 +151,12 @@ if (options["ldap-backend-type"] == "fedora-ds") {
 	var res = ldb.search("(&(&(linkID=*)(!(linkID:1.2.840.113556.1.4.803:=1)))(objectclass=attributeSchema))", subobj.SCHEMADN, ldb.SCOPE_SUBTREE, attrs);
 	assert(res.error == 0);
 	var memberof_config = "";
+	var refint_attributes = "";
 	for (i=0; i < res.msgs.length; i++) {
 searchone(ldb, subobj.DOMAINDN, "(&(objectClass=computer)(cn=" + subobj.NETBIOSNAME + "))", "objectGUID");
 		var target = searchone(ldb, subobj.SCHEMADN, "(&(objectclass=attributeSchema)(linkID=" + (res.msgs[i].linkID + 1) + "))", "lDAPDisplayName");
 		if (target != undefined) {
+			refint_attributes = refint_attributes + " " + target + " " + res.msgs[i].lDAPDisplayName;
 			memberof_config = memberof_config + "overlay memberof
 memberof-dangling error
 memberof-refint TRUE
@@ -166,6 +168,11 @@ memberof-dangling-error 32
 ";
 		}
 	}
+
+	memberof_config = "overlay refint
+refint_attributes" + refint_attributes + "
+" + memberof_config;
+	
 	ok = sys.file_save(subobj.LDAPDIR + "/memberof.conf", memberof_config);
 	if (!ok) {
 		message("failed to create file: " + f + "\n");


-- 
Samba Shared Repository