[SCM] Samba Shared Repository - branch master updated

[Matthias Dieter Wallnöfer]

The branch, master has been updated
       via  49c8c13... s4:domainlevel - handle exceptions more precisely
      from  895b99f... Be more forgiving on client oplock break failure (as Windows does). Remove a global.

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


- Log -----------------------------------------------------------------
commit 49c8c130a0d08be7c869b9a63b5a37488003eac2
Author: Matthias Dieter Wallnöfer <mdw at samba.org>
Date:   Thu May 13 22:35:06 2010 +0200

    s4:domainlevel - handle exceptions more precisely
    
    LDB_ERR_UNWILLING_TO_PERFORM should be the right error code when the
    "msDS-Behavior-Version" was already raised by the first change as it is on
    Windows Server.
    
    When s4 itself does implement this trigger then we don't need to do the
    second write operation anymore (they're kept in sync).

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

Summary of changes:
 .../scripting/python/samba/netcmd/domainlevel.py   |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/scripting/python/samba/netcmd/domainlevel.py b/source4/scripting/python/samba/netcmd/domainlevel.py
index 310747a..72559bb 100644
--- a/source4/scripting/python/samba/netcmd/domainlevel.py
+++ b/source4/scripting/python/samba/netcmd/domainlevel.py
@@ -200,7 +200,7 @@ class cmd_domainlevel(Command):
                     try:
                         samdb.modify(m)
                     except LdbError, (num, _):
-                        pass
+                        self.assertEquals(num, ldb.ERR_UNWILLING_TO_PERFORM)
 
                 # Directly on the base DN
                 m = ldb.Message()
@@ -219,7 +219,7 @@ class cmd_domainlevel(Command):
                 try:
                     samdb.modify(m)
                 except LdbError, (num, _):
-                    pass
+                    self.assertEquals(num, ldb.ERR_UNWILLING_TO_PERFORM)
 
                 level_domain = new_level_domain
                 msgs.append("Domain function level changed!")


-- 
Samba Shared Repository