diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2012-02-26 15:44:40 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2012-02-26 16:27:06 +0100 |
| commit | 21f443eb8286805dde6bbb1b8f37379f6e0aa203 (patch) | |
| tree | 512d27d2b9f67030b0bdecd7ebf574bfb34fc8cb /source4/scripting/python/samba/provision | |
| parent | 02ba9095e234b391690f0756128203dd86b7b40d (diff) | |
| download | samba-21f443eb8286805dde6bbb1b8f37379f6e0aa203.tar.gz samba-21f443eb8286805dde6bbb1b8f37379f6e0aa203.tar.xz samba-21f443eb8286805dde6bbb1b8f37379f6e0aa203.zip | |
provision: Leave result reporting up to caller.
Diffstat (limited to 'source4/scripting/python/samba/provision')
| -rw-r--r-- | source4/scripting/python/samba/provision/__init__.py | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/source4/scripting/python/samba/provision/__init__.py b/source4/scripting/python/samba/provision/__init__.py index 6f7adc1a2f..526c07a37c 100644 --- a/source4/scripting/python/samba/provision/__init__.py +++ b/source4/scripting/python/samba/provision/__init__.py @@ -118,6 +118,7 @@ class ProvisionPaths(object): self.dns = None self.winsdb = None self.private_dir = None + self.phpldapadminconfig = None class ProvisionNames(object): @@ -379,11 +380,16 @@ class ProvisionResult(object): def report_logger(self, logger): """Report this provision result to a logger.""" - logger.info("Server Role: %s" % self.server_role) - logger.info("Hostname: %s" % self.names.hostname) - logger.info("NetBIOS Domain: %s" % self.names.domain) - logger.info("DNS Domain: %s" % self.names.dnsdomain) - logger.info("DOMAIN SID: %s" % self.domainsid) + logger.info("Server Role: %s", self.server_role) + logger.info("Hostname: %s", self.names.hostname) + logger.info("NetBIOS Domain: %s", self.names.domain) + 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) def check_install(lp, session_info, credentials): @@ -1837,9 +1843,6 @@ def provision(logger, session_info, credentials, smbconf=None, result.samdb = samdb result.idmap = idmap result.domainsid = str(domainsid) - result.report_logger(logger) - logger.info("A phpLDAPadmin configuration file suitable for administering the Samba 4 LDAP server has been created in %s .", - paths.phpldapadminconfig) if samdb_fill == FILL_FULL: if adminpass_generated: |