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 <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Garming Sam <garming@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>

1 files changed, 5 insertions, 4 deletions

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.