diff options
| author | Douglas Bagnall <douglas.bagnall@catalyst.net.nz> | 2015-06-23 16:38:29 +1200 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2015-10-29 05:08:16 +0100 |
| commit | e29fba640b7d543f1e7177aa9357c82f590b6b07 (patch) | |
| tree | 9b0f71f511fb66288527717f0f770301a1eed628 /source4/scripting | |
| parent | 46ac3a5308dfc5d03173bbae03734ba327f0e570 (diff) | |
| download | samba-e29fba640b7d543f1e7177aa9357c82f590b6b07.tar.gz | |
KCC: with --import-ldif, don't default to standard DB url
Before samba_kcc would always assume `-H /usr/local/whatever`, and this
interacted badly with the likes of `--test-all-reps-from` and
`--forget-intersite-links`. When I say badly, I mean it crashed because
the file is absent on my dev machine.
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-x | source4/scripting/bin/samba_kcc | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/source4/scripting/bin/samba_kcc b/source4/scripting/bin/samba_kcc index 02e955684ac..d22d9709f7c 100755 --- a/source4/scripting/bin/samba_kcc +++ b/source4/scripting/bin/samba_kcc @@ -271,7 +271,13 @@ lp = sambaopts.get_loadparm() creds = credopts.get_credentials(lp, fallback_machine=True) if opts.dburl is None: - opts.dburl = lp.samdb_url() + if opts.importldif: + opts.dburl = opts.tmpdb + else: + opts.dburl = lp.samdb_url() +elif opts.importldif: + logger.error("Don't use -H/--URL with --importldif, use --tmpdb instead") + sys.exit(1) # Instantiate Knowledge Consistency Checker and perform run kcc = KCC(unix_now, readonly=opts.readonly, verify=opts.verify, |