[SCM] Samba Shared Repository - branch master updated

[Noel Power]

The branch, master has been updated
       via  1a9da378a15 sambaundoguididx: Add flags=ldb.FLG_DONT_CREATE_DB and port to Python3
      from  3b608510e4b third_party: Update nss_wrapper to version 1.1.6

https://git.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 1a9da378a1505daff498be6d6355debd73526a1a
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Mon May 20 16:29:10 2019 +1200

    sambaundoguididx: Add flags=ldb.FLG_DONT_CREATE_DB and port to Python3
    
    In py3 we need to add an extra str() around the returned ldb value to
    enable .split() to be used.
    
    Signed-off-by: Andrew Bartlett <abartlet at samba.org>
    Reviewed By: Noel Power <npower at samba.org>
    
    Autobuild-User(master): Noel Power <npower at samba.org>
    Autobuild-Date(master): Thu May 23 14:25:52 UTC 2019 on sn-devel-184

-----------------------------------------------------------------------

Summary of changes:
 source4/scripting/bin/sambaundoguididx | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/scripting/bin/sambaundoguididx b/source4/scripting/bin/sambaundoguididx
index 00fe63897b4..f67353ff361 100755
--- a/source4/scripting/bin/sambaundoguididx
+++ b/source4/scripting/bin/sambaundoguididx
@@ -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)
 


-- 
Samba Shared Repository