sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-09 08:58:35 +03:00
Code

sambaundoguididx: fix for -s

Browse Source 
Quick fix running this script with -s instead of -H. samdb_url() returns
a url with a protocol prefix, which causes issues further down in the
script.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=13978

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Garming Sam <garming@catalyst.net.nz>
(cherry picked from commit 40ca8ed5a152ae7c5ec039649c09a037a20a4143)
This commit is contained in:
Andrew Bartlett 2019-05-20 16:29:10 +12:00 committed by Karolin Seeger
parent f3f259e736
commit 00950aa7cf
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source4/scripting/bin/sambaundoguididx
View File

@ -30,7 +30,7 @@ lp_ctx = sambaopts.get_loadparm()
lp_ctx.set("dsdb:guid index", "false")
if opts.H is None:
url = lp_ctx.samdb_url()
url = lp_ctx.private_path("sam.ldb")
else:
url = opts.H
@ -62,7 +62,9 @@ dbs = []
for part in partitions[0]['partition']:
dbname = str(part).split(":")[1]
dbpath = os.path.join(privatedir, dbname)
db = ldb.Ldb(url="ldb://" + dbpath,
if os.path.isfile(dbpath):
dbpath = "ldb://" + dbpath
db = ldb.Ldb(url=dbpath,
options=["modules:"],
flags=ldb.FLG_DONT_CREATE_DB)
db.transaction_start()