[SCM] Samba Shared Repository - branch master updated

[Douglas Bagnall]

The branch, master has been updated
       via  60e4bd3 kcc: Don't check schedule if None
      from  bff3e5e torture/ioctl: switch sparse src/dest dup ext behaviour

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


- Log -----------------------------------------------------------------
commit 60e4bd381a8fc5b74b52e85f111cd5113bd6772b
Author: Garming Sam <garming at catalyst.net.nz>
Date:   Thu Sep 22 15:28:57 2016 +1200

    kcc: Don't check schedule if None
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=12286
    
    Signed-off-by: Garming Sam <garming at catalyst.net.nz>
    Reviewed-by: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
    
    Autobuild-User(master): Douglas Bagnall <dbagnall at samba.org>
    Autobuild-Date(master): Fri Sep 23 06:52:28 CEST 2016 on sn-devel-144

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

Summary of changes:
 python/samba/kcc/kcc_utils.py | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)


Changeset truncated at 500 lines:

diff --git a/python/samba/kcc/kcc_utils.py b/python/samba/kcc/kcc_utils.py
index 2c3e322..1d4b9d6 100644
--- a/python/samba/kcc/kcc_utils.py
+++ b/python/samba/kcc/kcc_utils.py
@@ -1214,11 +1214,19 @@ class NTDSConnection(object):
 
         :param shed: schedule to compare to
         """
-        if self.schedule is not None:
-            if sched is None:
-                return False
-        elif sched is None:
-            return True
+        # There are 4 cases, where either self.schedule or sched can be None
+        #
+        #                   |  self. is None  |   self. is not None
+        #     --------------+-----------------+--------------------
+        #     sched is None |     True        |     False
+        #     --------------+-----------------+--------------------
+        # sched is not None |    False        |    do calculations
+
+        if self.schedule is None:
+            return sched is None
+
+        if sched is None:
+            return False
 
         if ((self.schedule.size != sched.size or
              self.schedule.bandwidth != sched.bandwidth or


-- 
Samba Shared Repository