summaryrefslogtreecommitdiff
path: root/source4/scripting/libjs
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2007-11-10 05:31:26 +0100
committerStefan Metzmacher <metze@samba.org>2007-12-21 05:45:03 +0100
commit716391f10679e82835f42490e1d8a69af2acad82 (patch)
tree367dd0ceef02811d8110fc967970db3edf17a553 /source4/scripting/libjs
parent529763a9aa192a6785ba878aceeb1683c2510913 (diff)
downloadsamba-716391f10679e82835f42490e1d8a69af2acad82.tar.gz
samba-716391f10679e82835f42490e1d8a69af2acad82.tar.bz2
samba-716391f10679e82835f42490e1d8a69af2acad82.zip
r25921: Now also listen on ldapi by default in the LDAP server
Create a phpLDAPadmin configuration file example to use ldapi to talk to Samba4 Andrew Bartlett (This used to be commit 54f4c8ba6127757fd272bd97e301188eb69977ed)
Diffstat (limited to 'source4/scripting/libjs')
-rw-r--r--source4/scripting/libjs/provision.js11
1 files changed, 11 insertions, 0 deletions
diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js
index 5ca7be99e5..f12c4406ff 100644
--- a/source4/scripting/libjs/provision.js
+++ b/source4/scripting/libjs/provision.js
@@ -162,6 +162,7 @@ function ldb_erase(info, ldb)
/* delete the specials */
ldb.del("@INDEXLIST");
ldb.del("@ATTRIBUTES");
+ ldb.del("@OPTIONS");
ldb.del("@MODULES");
ldb.del("@PARTITION");
ldb.del("@KLUDGEACL");
@@ -393,6 +394,9 @@ function provision_default_paths(subobj)
paths.ldap_config_basedn_ldif = paths.ldapdir + "/" + dnsdomain + "-config.ldif";
paths.ldap_schema_basedn_ldif = paths.ldapdir + "/" + dnsdomain + "-schema.ldif";
+ paths.s4_ldapi_socket = lp.get("private dir") + "/ldapi";
+ paths.phpldapadminconfig = lp.get("private dir") + "/phpldapadmin-config.php";
+
paths.sysvol = lp.get("sysvol", "path");
if (paths.sysvol == undefined) {
@@ -489,6 +493,9 @@ function provision_fix_subobj(subobj, paths)
var ldap_path_list = split("/", paths.ldapdir);
subobj.LDAPI_URI = "ldapi://" + join("%2F", ldap_path_list) + "%2Fldapi";
+ var s4ldap_path_list = split("/", paths.s4_ldapi_socket);
+ subobj.S4_LDAPI_URI = "ldapi://" + join("%2F", s4ldap_path_list);
+
subobj.LDAPMANAGERDN = "cn=Manager," + subobj.DOMAINDN;
subobj.NETLOGONPATH = paths.netlogon;
@@ -794,6 +801,10 @@ function provision(subobj, message, blank, paths, session_info, credentials, lda
assert(commit_ok);
}
+ message("Setting up phpLDAPadmin configuration\n");
+ setup_file("phpldapadmin-config.php", info.message, paths.phpldapadminconfig, subobj);
+ message("Please install the phpLDAPadmin configuration located at " + paths.phpldapadminconfig + " into /etc/phpldapadmin/config.php\n");
+
return true;
}