diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2008-07-18 18:58:56 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2008-07-18 18:58:56 +1000 |
| commit | 3408a2d18fa61e2a7e3b3e05cc3c454e5e15f2ce (patch) | |
| tree | 1fdaefc34cbc20fc5a97612379149d1b89203c83 | |
| parent | cfc2063f230491865edb8f73174e0b12ab4dc158 (diff) | |
| download | samba-3408a2d18fa61e2a7e3b3e05cc3c454e5e15f2ce.tar.gz samba-3408a2d18fa61e2a7e3b3e05cc3c454e5e15f2ce.tar.bz2 samba-3408a2d18fa61e2a7e3b3e05cc3c454e5e15f2ce.zip | |
Make a seperate template for the refint configuration too
(This used to be commit d2a527acc5ee6fe9b943657dc9c3ace920b2d619)
| -rw-r--r-- | source4/scripting/python/samba/provision.py | 7 | ||||
| -rw-r--r-- | source4/setup/refint.conf | 3 | ||||
| -rw-r--r-- | source4/setup/slapd.conf | 2 |
3 files changed, 9 insertions, 3 deletions
diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py index 301c6ef728..6eb47c8595 100644 --- a/source4/scripting/python/samba/provision.py +++ b/source4/scripting/python/samba/provision.py @@ -1264,8 +1264,8 @@ def provision_backend(setup_dir=None, message=None, { "MEMBER_ATTR" : str(res[i]["lDAPDisplayName"][0]), "MEMBEROF_ATTR" : str(target) }) - memberof_config += """overlay refint -refint_attributes""" + refint_attributes + refint_config = read_and_sub_file(setup_path("refint.conf"), + { "LINK_ATTRS" : refint_attributes}) setup_file(setup_path("slapd.conf"), paths.slapdconf, {"DNSDOMAIN": names.dnsdomain, @@ -1273,7 +1273,8 @@ refint_attributes""" + refint_attributes "DOMAINDN": names.domaindn, "CONFIGDN": names.configdn, "SCHEMADN": names.schemadn, - "MEMBEROF_CONFIG": memberof_config}) + "MEMBEROF_CONFIG": memberof_config, + "REFINT_CONFIG": refint_config}) setup_file(setup_path("modules.conf"), paths.modulesconf, {"REALM": names.realm}) diff --git a/source4/setup/refint.conf b/source4/setup/refint.conf new file mode 100644 index 0000000000..a3a7d3e0ad --- /dev/null +++ b/source4/setup/refint.conf @@ -0,0 +1,3 @@ +overlay refint +refint_modifiersName cn=samba-admin,cn=samba +refint_attributes ${LINK_ATTRS} diff --git a/source4/setup/slapd.conf b/source4/setup/slapd.conf index 68e494c27d..495847f7fe 100644 --- a/source4/setup/slapd.conf +++ b/source4/setup/slapd.conf @@ -40,6 +40,8 @@ include ${LDAPDIR}/modules.conf defaultsearchbase ${DOMAINDN} +${REFINT_CONFIG} + ${MEMBEROF_CONFIG} database ldif |