]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
sambaundoguididx: Add flags=ldb.FLG_DONT_CREATE_DB and port to Python3
authorAndrew Bartlett <abartlet@samba.org>
Mon, 20 May 2019 04:29:10 +0000 (16:29 +1200)
committerKarolin Seeger <kseeger@samba.org>
Wed, 28 Aug 2019 07:36:29 +0000 (07:36 +0000)
In py3 we need to add an extra str() around the returned ldb value to
enable .split() to be used.

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

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed By: Noel Power <npower@samba.org>

Autobuild-User(master): Noel Power <npower@samba.org>
Autobuild-Date(master): Thu May 23 14:25:52 UTC 2019 on sn-devel-184

(cherry picked from commit 1a9da378a1505daff498be6d6355debd73526a1a)

source4/scripting/bin/sambaundoguididx

index adff232e0228b63bc74a349bd22c53cd518a9025..9a38851b4213bc1b185b2c40650ee5b834fe4581 100755 (executable)
@@ -34,7 +34,9 @@ if opts.H is None:
 else:
     url = opts.H
 
-samdb = ldb.Ldb(url=url, options=["modules:"])
+samdb = ldb.Ldb(url=url,
+                flags=ldb.FLG_DONT_CREATE_DB,
+                options=["modules:"])
 
 partitions = samdb.search(base="@PARTITION",
                          scope=ldb.SCOPE_BASE,
@@ -58,10 +60,11 @@ privatedir = os.path.dirname(url)
 
 dbs = []
 for part in partitions[0]['partition']:
-    tdbname = part.split(":")[1]
-    tdbpath = os.path.join(privatedir, tdbname)
-
-    db = ldb.Ldb(url=tdbpath, options=["modules:"])
+    dbname = str(part).split(":")[1]
+    dbpath = os.path.join(privatedir, dbname)
+    db = ldb.Ldb(url="ldb://" + dbpath,
+                 options=["modules:"],
+                 flags=ldb.FLG_DONT_CREATE_DB)
     db.transaction_start()
     db.modify(modmsg)
     dbs.append(db)
@@ -73,7 +76,8 @@ samdb.transaction_commit()
 
 print("Re-opening with the full DB stack")
 samdb = SamDB(url=url,
-                          lp=lp_ctx)
+              flags=ldb.FLG_DONT_CREATE_DB,
+              lp=lp_ctx)
 print("Re-triggering another re-index")
 chk = dbcheck(samdb)