From b0e6a7436233c39f1ebf1a40e4c6cc495ed926f9 Mon Sep 17 00:00:00 2001 From: Douglas Bagnall Date: Wed, 10 Jun 2015 16:42:37 +1200 Subject: KCC: split kcc_utils into samba.kcc.{kcc_utils,graph} graph.py has the intersite graph stuff. kcc_utils does intrasite, namespace, &cetera. The wildcard imports are tidied up, so samba_kcc imports unix2nttime directly rather than letting it fall out of kcc_utils. Intersite graph functions samba/kcc/__init__.py are also shifted into graph.py. Signed-off-by: Douglas Bagnall Reviewed-by: Garming Sam Reviewed-by: Andrew Bartlett --- source4/scripting/bin/samba_kcc | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'source4') diff --git a/source4/scripting/bin/samba_kcc b/source4/scripting/bin/samba_kcc index a7a1953c893..4abec6f3803 100755 --- a/source4/scripting/bin/samba_kcc +++ b/source4/scripting/bin/samba_kcc @@ -51,14 +51,15 @@ from samba import ( ldb, dsdb, drs_utils, - nttime2unix) + nttime2unix, + unix2nttime) from samba.auth import system_session from samba.samdb import SamDB from samba.dcerpc import drsuapi -from samba.kcc_utils import * -from samba.kcc.debug import * from samba import ldif_utils - +from samba.kcc.kcc_utils import * +from samba.kcc.graph import * +from samba.kcc.debug import * class KCC(object): """The Knowledge Consistency Checker class. -- cgit v1.2.1