summaryrefslogtreecommitdiff
path: root/source4/scripting
diff options
context:
space:
mode:
authorDouglas Bagnall <douglas.bagnall@catalyst.net.nz>2015-06-05 15:09:05 +1200
committerAndrew Bartlett <abartlet@samba.org>2015-06-12 06:57:13 +0200
commit032291f49247b740aa6f4c9ec5bd51364e02779d (patch)
tree5a7dec5cb0871dbd9f6c8cb2ade6d94e9b2c06dd /source4/scripting
parentdb56d4ae3b0a0b8e76beee1fe5ccbb2c3c258e68 (diff)
downloadsamba-032291f49247b740aa6f4c9ec5bd51364e02779d.tar.gz
KCC: shift samba.ldif_utils to samba.kcc.ldif_import_export
These functions are really only of use for KCC, and they only import and export rather than be general utils. 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>
Diffstat (limited to 'source4/scripting')
-rwxr-xr-xsource4/scripting/bin/samba_kcc12
1 files changed, 6 insertions, 6 deletions
diff --git a/source4/scripting/bin/samba_kcc b/source4/scripting/bin/samba_kcc
index 4abec6f3803..0d3de445c59 100755
--- a/source4/scripting/bin/samba_kcc
+++ b/source4/scripting/bin/samba_kcc
@@ -56,7 +56,7 @@ from samba import (
from samba.auth import system_session
from samba.samdb import SamDB
from samba.dcerpc import drsuapi
-from samba import ldif_utils
+from samba.kcc import ldif_import_export
from samba.kcc.kcc_utils import *
from samba.kcc.graph import *
from samba.kcc.debug import *
@@ -2667,9 +2667,9 @@ class KCC(object):
:param ldif_file: path to the ldif file to import
"""
try:
- self.samdb = ldif_utils.ldif_to_samdb(dburl, lp, ldif_file,
- opts.forced_local_dsa)
- except ldif_utils.LdifError, e:
+ self.samdb = ldif_import_export.ldif_to_samdb(dburl, lp, ldif_file,
+ opts.forced_local_dsa)
+ except ldif_import_export.LdifError, e:
print e
return 1
return 0
@@ -2690,9 +2690,9 @@ class KCC(object):
:param ldif_file: output LDIF file name to create
"""
try:
- ldif_utils.samdb_to_ldif_file(self.samdb, dburl, lp, creds,
+ ldif_import_export.samdb_to_ldif_file(self.samdb, dburl, lp, creds,
ldif_file)
- except ldif_utils.LdifError, e:
+ except ldif_import_export.LdifError, e:
print e
return 1
return 0