BIND 10 trac1514, updated. 0ed47de0a1900e15b7c70bfd67fc907ce85ff2cb [1514] If the new serial number is greater or equal to the old one, the SOA in zone should be replaced by the new one. If not, the serial number in SOA will be increased automatically

[BIND 10 source code commits]

The branch, trac1514 has been updated
       via  0ed47de0a1900e15b7c70bfd67fc907ce85ff2cb (commit)
      from  4d25eba05071e631333c26580ae495c50c6ae895 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 0ed47de0a1900e15b7c70bfd67fc907ce85ff2cb
Author: haikuo zhang <zhanghaikuo at cnnic.cn>
Date:   Thu Jun 7 10:13:57 2012 +0800

    [1514] If the new serial number is greater or equal to the old one, the SOA in
    zone should be replaced by the new one. If not, the serial number in SOA will be
    increased automatically

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

Summary of changes:
 src/lib/python/isc/ddns/session.py |   10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/lib/python/isc/ddns/session.py b/src/lib/python/isc/ddns/session.py
index c97ddc7..1f7cde2 100644
--- a/src/lib/python/isc/ddns/session.py
+++ b/src/lib/python/isc/ddns/session.py
@@ -729,16 +729,12 @@ class UpdateSession:
                                                 ZoneFinder.NO_WILDCARD |
                                                 ZoneFinder.FIND_GLUE_OK)
         serial_operation = DDNS_SOA()
-        if self.__added_soa is not None:
-            # serial check goes here
-            if serial_operation.soa_update_check(old_soa, self.__added_soa):
+        if self.__added_soa is not None and\
+        serial_operation.soa_update_check(old_soa, self.__added_soa):
                 new_soa = self.__added_soa
-            else:
-                pass
         else:
-            new_soa = old_soa
             # increment goes here
-            new_soa = serial_operation.update_soa(new_soa)
+            new_soa = serial_operation.update_soa(old_soa)
 
         diff.delete_data(old_soa)
         diff.add_data(new_soa)