Attachment 8487 Details for Bug 9597 – patches cherry-picked from master

[patch] patches cherry-picked from master

0002-dbcheck-look-in-hasMasterNCs-as-well-for-determining.patch (text/plain), 1.92 KB, created by Andrew Bartlett on 2013-01-25 04:21:24 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andrew Bartlett

Created: 2013-01-25 04:21:24 UTC

Size: 1.92 KB

patch

obsolete

>From 01e6cef855a104a281c0c6e578d2fc3813555e86 Mon Sep 17 00:00:00 2001
>From: Matthieu Patou <mat@matws.net>
>Date: Tue, 23 Oct 2012 22:09:20 -0700
>Subject: [PATCH 2/2] dbcheck: look in hasMasterNCs as well for determining
> the instance type of a NC
>
>Forest of level 2000 don't hve the msDS-hasMasterNCs parameter
>
>Reviewed-by: Andrew Bartlett <abartlet@samba.org>
>(cherry picked from commit 3b7977419726a8630de828b634d669625ee358dd)
>---
> source4/scripting/python/samba/dbchecker.py | 12 ++++++++++--
> 1 file changed, 10 insertions(+), 2 deletions(-)
>
>diff --git a/source4/scripting/python/samba/dbchecker.py b/source4/scripting/python/samba/dbchecker.py
>index e1be6c4..b71ac05 100644
>--- a/source4/scripting/python/samba/dbchecker.py
>+++ b/source4/scripting/python/samba/dbchecker.py
>@@ -59,11 +59,19 @@ class dbcheck(object):
>         self.rid_dn = ldb.Dn(samdb, "CN=RID Manager$,CN=System," + samdb.domain_dn())
>         self.ntds_dsa = samdb.get_dsServiceName()
> 
>-        res = self.samdb.search(base=self.ntds_dsa, scope=ldb.SCOPE_BASE, attrs=['msDS-hasMasterNCs'])
>+        res = self.samdb.search(base=self.ntds_dsa, scope=ldb.SCOPE_BASE, attrs=['msDS-hasMasterNCs', 'hasMasterNCs'])
>         if "msDS-hasMasterNCs" in res[0]:
>             self.write_ncs = res[0]["msDS-hasMasterNCs"]
>         else:
>-            self.write_ncs = None
>+            # If the Forest Level is less than 2003 then there is no
>+            # msDS-hasMasterNCs, so we fall back to hasMasterNCs
>+            # no need to merge as all the NCs that are in hasMasterNCs must
>+            # also be in msDS-hasMasterNCs (but not the opposite)
>+            if "hasMasterNCs" in res[0]:
>+                self.write_ncs = res[0]["hasMasterNCs"]
>+            else:
>+                self.write_ncs = None
>+
> 
>     def check_database(self, DN=None, scope=ldb.SCOPE_SUBTREE, controls=[], attrs=['*']):
>         '''perform a database check, returning the number of errors found'''
>-- 
>1.7.11.7
>

Flags:

metze: review+

Actions: View

Attachments on bug 9597: 8487