[SCM] Samba Shared Repository - branch master updated

[Kamen Mazdrashki]

The branch, master has been updated
       via  2ce6e64 s4-devel/pfm_verify: Move schemaInfo getter into separate function
      from  e43de85 wafsamba: Allow newer or the same python module versions to be installed, not older.

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


- Log -----------------------------------------------------------------
commit 2ce6e648ed0354a0df5608a8b43ce0be967cc08f
Author: Kamen Mazdrashki <kamenim at samba.org>
Date:   Wed Dec 22 01:09:59 2010 +0200

    s4-devel/pfm_verify: Move schemaInfo getter into separate function
    
    so it can be used against Windows DC without fetching prefixMap
    Fetching prefixMap doesn't work against WinDCs for some reason at the moment
    
    Autobuild-User: Kamen Mazdrashki <kamenim at samba.org>
    Autobuild-Date: Wed Dec 22 01:28:49 CET 2010 on sn-devel-104

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

Summary of changes:
 source4/scripting/devel/pfm_verify.py |   16 ++++++++++++----
 1 files changed, 12 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/scripting/devel/pfm_verify.py b/source4/scripting/devel/pfm_verify.py
index 300fd05..2b54aad 100755
--- a/source4/scripting/devel/pfm_verify.py
+++ b/source4/scripting/devel/pfm_verify.py
@@ -42,14 +42,22 @@ def _samdb_fetch_pfm(samdb):
     assert len(res) == 1
     pfm = ndr_unpack(drsblobs.prefixMapBlob,
                      str(res[0]['prefixMap']))
-    pfm_schi = None
+
+    pfm_schi = _samdb_fetch_schi(samdb)
+
+    return (pfm.ctr, pfm_schi)
+
+def _samdb_fetch_schi(samdb):
+    """Fetch schemaInfo stored in SamDB using LDB connection"""
+    res = samdb.search(base=samdb.get_schema_basedn(), expression="", scope=SCOPE_BASE, attrs=["*"])
+    assert len(res) == 1
     if 'schemaInfo' in res[0]:
-        pfm_schi = pfm_schi = ndr_unpack(drsblobs.schemaInfoBlob,
-                                         str(res[0]['schemaInfo']))
+        pfm_schi = ndr_unpack(drsblobs.schemaInfoBlob,
+                              str(res[0]['schemaInfo']))
     else:
         pfm_schi = drsblobs.schemaInfoBlob()
         pfm_schi.marker = 0xFF;
-    return (pfm.ctr, pfm_schi)
+    return pfm_schi
 
 def _drs_fetch_pfm(server, samdb, creds, lp):
     """Fetch prefixMap using DRS interface"""


-- 
Samba Shared Repository