Attachment 12508 Details for Bug 12286 – Patch for 4.5

[patch] Patch for 4.5

0001-kcc-Don-t-check-schedule-if-None.patch (text/plain), 1.76 KB, created by Garming Sam on 2016-09-23 04:59:26 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Garming Sam

Created: 2016-09-23 04:59:26 UTC

Size: 1.76 KB

patch

obsolete

>From bd3c147d313950652206267d8ab631594973ec32 Mon Sep 17 00:00:00 2001
>From: Garming Sam <garming@catalyst.net.nz>
>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 <garming@catalyst.net.nz>
>Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
>
>Autobuild-User(master): Douglas Bagnall <dbagnall@samba.org>
>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
>

Flags:

dbagnall: review+

Actions: View

Attachments on bug 12286: 12508