mirror of
https://github.com/samba-team/samba.git
synced 2025-07-23 20:59:10 +03:00
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).
This commit is contained in:
@ -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!")
|
||||
|
Reference in New Issue
Block a user