git.samba.org
/
obnox
/
samba
/
samba-obnox.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
9f0209a
)
KCC: fix KCC.import_ldif() use of forced_local_dsa
author
Douglas Bagnall
<douglas.bagnall@catalyst.net.nz>
Fri, 1 May 2015 04:11:04 +0000
(16:11 +1200)
committer
Andrew Bartlett
<abartlet@samba.org>
Fri, 12 Jun 2015 04:57:14 +0000
(06:57 +0200)
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>
python/samba/kcc/__init__.py
patch
|
blob
|
history
diff --git
a/python/samba/kcc/__init__.py
b/python/samba/kcc/__init__.py
index 37fc844fd980ac3f938ac539b598ff4c21ca0a32..999a6f12fe5b1047f84e35b97544db07c1a02c85 100644
(file)
--- a/
python/samba/kcc/__init__.py
+++ b/
python/samba/kcc/__init__.py
@@
-2656,7
+2656,7
@@
class KCC(object):
return 0
- def import_ldif(self, dburl, lp, creds, ldif_file):
+ def import_ldif(self, dburl, lp, creds, ldif_file
, forced_local_dsa=None
):
"""Import all objects and attributes that are relevent
to the KCC algorithms from a previously exported LDIF file.
@@
-2673,7
+2673,7
@@
class KCC(object):
"""
try:
self.samdb = ldif_import_export.ldif_to_samdb(dburl, lp, ldif_file,
-
self.
forced_local_dsa)
+ forced_local_dsa)
except ldif_import_export.LdifError, e:
print e
return 1