sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-10-23 11:33:16 +03:00
Code Activity

r19216: Merge from SAMBA_4_0_RELEASE:

Browse Source 
Move default for subobj.LDAPMODULES into scripting/libjs/provision.js
so that SWAT can provision again.

Andrew Bartlett
(This used to be commit a4aafe307d)
This commit is contained in:
Andrew Bartlett
2006-10-10 04:20:50 +00:00
committed by Gerald (Jerry) Carter
parent e461cfee2e
commit 7135bb9e63
2 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
source4/scripting/libjs/provision.js
View File

@@ -625,6 +625,7 @@ function provision_guess()
rdn_list = split(".", subobj.DNSDOMAIN); rdn_list = split(".", subobj.DNSDOMAIN);
subobj.BASEDN = "DC=" + join(",DC=", rdn_list); subobj.BASEDN = "DC=" + join(",DC=", rdn_list);
subobj.LDAPBACKEND = "users.ldb"; subobj.LDAPBACKEND = "users.ldb";
subobj.LDAPMODULES = "objectguid";
subobj.EXTENSIBLEOBJECT = "# no objectClass: extensibleObject for local ldb"; subobj.EXTENSIBLEOBJECT = "# no objectClass: extensibleObject for local ldb";
return subobj; return subobj;
} }

2
source4/setup/provision
View File

@@ -113,8 +113,6 @@ for (r in options) {
if (options["ldap-backend"] != undefined) { if (options["ldap-backend"] != undefined) {
subobj["LDAPMODULES"] = "entryUUID,paged_searches"; subobj["LDAPMODULES"] = "entryUUID,paged_searches";
} else {
subobj["LDAPMODULES"] = "objectguid";
} }
var blank = (options["blank"] != undefined); var blank = (options["blank"] != undefined);