sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-02 09:47:23 +03:00
Code

s4:samba_kcc: Use 'dburl' passed from command line rather than lp.samdb_url()

Browse Source 
This patch makes '-H, --URL' param to actually work as expected

Change-Id: Ie7f4e9e3fc1f79a938473312e200f36de6886596
Signed-off-by: Kamen Mazdrashki <kamenim@samba.org>
Reviewed-By: Jelmer Vernooij <jelmer@samba.org>
This commit is contained in:
Kamen Mazdrashki 2014-04-21 17:51:09 +02:00
parent 1b71f080ea
commit 9006198839
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source4/scripting/bin/samba_kcc
View File

@ -1910,13 +1910,13 @@ class KCC(object):
# currently importing an ldif for a test run # currently importing an ldif for a test run
if self.samdb is None: if self.samdb is None:
try: try:
self.samdb = SamDB(url=lp.samdb_url(), self.samdb = SamDB(url=dburl,
session_info=system_session(), session_info=system_session(),
credentials=creds, lp=lp) credentials=creds, lp=lp)
except ldb.LdbError, (num, msg): except ldb.LdbError, (num, msg):
logger.error("Unable to open sam database %s : %s" % logger.error("Unable to open sam database %s : %s" %
(lp.samdb_url(), msg)) (dburl, msg))
return 1 return 1
try: try:
@ -2027,7 +2027,7 @@ class KCC(object):
credentials=creds, lp=lp) credentials=creds, lp=lp)
except ldb.LdbError, (enum, estr): except ldb.LdbError, (enum, estr):
logger.error("Unable to open sam database (%s) : %s" % logger.error("Unable to open sam database (%s) : %s" %
(lp.samdb_url(), estr)) (dburl, estr))
return 1 return 1
if os.path.exists(ldif_file): if os.path.exists(ldif_file):