From: Stefan Metzmacher <metze@samba.org>
Date: Thu, 28 Feb 2019 17:16:27 +0000 (+0100)
Subject: dbcheck: add find_repl_attid() helper function
X-Git-Tag: samba-4.8.10~13
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2272dea483ecb0d43cc4d155b92e34a07a49146d;p=thirdparty%2Fsamba.git

dbcheck: add find_repl_attid() helper function

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

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
(cherry picked from commit 598e38d2a5e0832429ba65b4e55bf7127618f894)
---

diff --git a/python/samba/dbchecker.py b/python/samba/dbchecker.py
index a11e76038e5..4b21cab80b7 100644
--- a/python/samba/dbchecker.py
+++ b/python/samba/dbchecker.py
@@ -1454,6 +1454,12 @@ newSuperior: %s""" % (str(from_dn), str(to_rdn), str(to_base)))
 
         return error_count
 
+    def find_repl_attid(self, repl, attid):
+        for o in repl.ctr.array:
+            if o.attid == attid:
+                return o
+
+        return None
 
     def get_originating_time(self, val, attid):
         '''Read metadata properties and return the originating time for
@@ -1463,12 +1469,9 @@ newSuperior: %s""" % (str(from_dn), str(to_rdn), str(to_base)))
         '''
 
         repl = ndr_unpack(drsblobs.replPropertyMetaDataBlob, str(val))
-        obj = repl.ctr
-
-        for o in repl.ctr.array:
-            if o.attid == attid:
-                return o.originating_change_time
-
+        o = self.find_repl_attid(repl, attid)
+        if o is not None:
+            return o.originating_change_time
         return 0
 
     def process_metadata(self, dn, val):