sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-02 09:47:23 +03:00
Code

Removed phpldapadmin inclusion for Samba 4.

Browse Source 
Signed-off-by: Andrew Bartlett <abartlet@samba.org>

Autobuild-User(master): Andrew Bartlett <abartlet@samba.org>
Autobuild-Date(master): Wed Oct 17 12:55:44 CEST 2012 on sn-devel-104
This commit is contained in:
Ricky Nance 2012-10-16 00:52:51 -05:00 committed by Andrew Bartlett
parent 83d34bb2bb
commit d09ac9636a
3 changed files with 0 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
source4/scripting/python/samba/provision/__init__.py
View File

@ -122,7 +122,6 @@ class ProvisionPaths(object):
self.winsdb = None
self.private_dir = None
self.state_dir = None
self.phpldapadminconfig = None
class ProvisionNames(object):
@ -401,12 +400,6 @@ class ProvisionResult(object):
logger.info("DNS Domain: %s", self.names.dnsdomain)
logger.info("DOMAIN SID: %s", self.domainsid)
if self.paths.phpldapadminconfig is not None:
logger.info(
"A phpLDAPadmin configuration file suitable for administering "
"the Samba 4 LDAP server has been created in %s.",
self.paths.phpldapadminconfig)
if self.backend_result:
self.backend_result.report_logger(logger)
@ -474,8 +467,6 @@ def provision_paths_from_lp(lp, dnsdomain):
paths.krb5conf = os.path.join(paths.private_dir, "krb5.conf")
paths.winsdb = os.path.join(paths.private_dir, "wins.ldb")
paths.s4_ldapi_path = os.path.join(paths.private_dir, "ldapi")
paths.phpldapadminconfig = os.path.join(paths.private_dir,
"phpldapadmin-config.php")
paths.hklm = "hklm.ldb"
paths.hkcr = "hkcr.ldb"
paths.hkcu = "hkcu.ldb"
@ -2052,8 +2043,6 @@ def provision(logger, session_info, credentials, smbconf=None,
backend_result = provision_backend.post_setup()
provision_backend.shutdown()
create_phpldapadmin_config(paths.phpldapadminconfig,
ldapi_url)
except:
secrets_ldb.transaction_cancel()
raise
@ -2124,15 +2113,6 @@ def provision_become_dc(smbconf=None, targetdir=None,
return res
def create_phpldapadmin_config(path, ldapi_uri):
"""Create a PHP LDAP admin configuration file.
:param path: Path to write the configuration to.
"""
setup_file(setup_path("phpldapadmin-config.php"), path,
{"S4_LDAPI_URI": ldapi_uri})
def create_krb5_conf(path, dnsdomain, hostname, realm):
"""Write out a file containing zone statements suitable for inclusion in a
named.conf file (including GSS-TSIG configuration).

10
source4/scripting/python/samba/tests/provision.py
View File

@ -104,9 +104,6 @@ class Disabled(object):
def test_setup_samdb_partitions(self):
raise NotImplementedError(self.test_setup_samdb_partitions)
def test_create_phpldapadmin_config(self):
raise NotImplementedError(self.test_create_phpldapadmin_config)
def test_provision_dns(self):
raise NotImplementedError(self.test_provision_dns)
@ -185,13 +182,6 @@ class ProvisionResultTests(TestCase):
('INFO', 'DNS Domain: dnsdomein'),
('INFO', 'DOMAIN SID: S1-1-1')])
def test_report_logger_phpldapadmin(self):
result = self.base_result()
result.paths.phpldapadminconfig = "/some/ldapconfig"
entries = self.report_logger(result)
self.assertEquals(entries[-1],
("INFO", "A phpLDAPadmin configuration file suitable for administering the Samba 4 LDAP server has been created in /some/ldapconfig."))
def test_report_logger_adminpass(self):
result = self.base_result()
result.adminpass_generated = True

20
source4/setup/phpldapadmin-config.php
View File

@ -1,20 +0,0 @@
<?php
/**
* The phpLDAPadmin config file, customised for use with Samba4
*
* Use config.php.example to create config.php, if you don't have one.
*
* Append this file to config.php.
*/
/* Create a new LDAP server for SAMBA4 */
$servers->newServer('ldap_pla');
/* A convenient name that will appear in the tree viewer and throughout
phpLDAPadmin to identify this LDAP server to users. */
$servers->setValue('server','name','Samba4 LDAP Server');
$servers->setValue('server','host','${S4_LDAPI_URI}');
$servers->setValue('login','auth_type','session');
$servers->setValue('login','attr','dn');
?>