From: Andreas Schneider Date: Fri, 5 May 2017 09:21:03 +0000 (+0200) Subject: samba-tool: Rename Samba4 to Samba AD X-Git-Tag: ldb-1.1.30~341 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e11ee75d9f24dbeee7004994621270bfbf32359d;p=thirdparty%2Fsamba.git samba-tool: Rename Samba4 to Samba AD We should stop talking about Samba4 and use the terms Samba AD and Samba FS. Signed-off-by: Andreas Schneider Reviewed-by: Guenther Deschner Autobuild-User(master): Andreas Schneider Autobuild-Date(master): Fri May 5 15:51:54 CEST 2017 on sn-devel-144 --- diff --git a/python/samba/provision/__init__.py b/python/samba/provision/__init__.py index b001c544fb9..d61f26e1345 100644 --- a/python/samba/provision/__init__.py +++ b/python/samba/provision/__init__.py @@ -1,5 +1,5 @@ # Unix SMB/CIFS implementation. -# backend code for provisioning a Samba4 server +# backend code for provisioning a Samba AD server # Copyright (C) Jelmer Vernooij 2007-2012 # Copyright (C) Andrew Bartlett 2008-2009 @@ -474,7 +474,7 @@ class ProvisionResult(object): def report_logger(self, logger): """Report this provision result to a logger.""" logger.info( - "Once the above files are installed, your Samba4 server will " + "Once the above files are installed, your Samba AD server will " "be ready to use") if self.adminpass_generated: logger.info("Admin password: %s", self.adminpass) diff --git a/python/samba/tests/provision.py b/python/samba/tests/provision.py index 91c66d52346..11b0135f473 100644 --- a/python/samba/tests/provision.py +++ b/python/samba/tests/provision.py @@ -171,7 +171,7 @@ class ProvisionResultTests(TestCase): result = self.base_result() entries = self.report_logger(result) self.assertEquals(entries, [ - ('INFO', 'Once the above files are installed, your Samba4 server ' + ('INFO', 'Once the above files are installed, your Samba AD server ' 'will be ready to use'), ('INFO', 'Server Role: domain controller'), ('INFO', 'Hostname: hostnaam'),