summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorDouglas Bagnall <douglas.bagnall@catalyst.net.nz>2015-06-17 16:38:29 +1200
committerAndrew Bartlett <abartlet@samba.org>2015-10-29 05:08:15 +0100
commitacd77283ccf3253bb7d5d048465bbf8e77a89982 (patch)
treebedcc1a3ed6d656dab5c7bbd7c0f9f509ac913e9 /source4
parent76f195a2792d0c4cd86a337881d1ce01194113af (diff)
downloadsamba-acd77283ccf3253bb7d5d048465bbf8e77a89982.tar.gz
KCC: default to not loading new samdb when we already have one
This should make things simpler in the --import-ldif case. 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')
-rwxr-xr-xsource4/scripting/bin/samba_kcc2
1 files changed, 1 insertions, 1 deletions
diff --git a/source4/scripting/bin/samba_kcc b/source4/scripting/bin/samba_kcc
index b5476dc031a..889e47b3376 100755
--- a/source4/scripting/bin/samba_kcc
+++ b/source4/scripting/bin/samba_kcc
@@ -301,7 +301,7 @@ if opts.importldif:
sys.exit(rc)
if opts.list_valid_dsas:
- kcc.load_samdb(opts.dburl, lp, creds)
+ kcc.load_samdb(opts.dburl, lp, creds, force=False)
print '\n'.join(kcc.list_dsas())
sys.exit()