From bd3c147d313950652206267d8ab631594973ec32 Mon Sep 17 00:00:00 2001 From: Garming Sam Date: Thu, 22 Sep 2016 15:28:57 +1200 Subject: [PATCH] kcc: Don't check schedule if None BUG: https://bugzilla.samba.org/show_bug.cgi?id=12286 Signed-off-by: Garming Sam Reviewed-by: Douglas Bagnall Autobuild-User(master): Douglas Bagnall Autobuild-Date(master): Fri Sep 23 06:52:28 CEST 2016 on sn-devel-144 (cherry picked from commit 60e4bd381a8fc5b74b52e85f111cd5113bd6772b) --- python/samba/kcc/kcc_utils.py | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) 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 -- 1.9.1