]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
samba_kcc: Ensure we bail out if s_dsa is None
authorAndrew Bartlett <abartlet@samba.org>
Thu, 19 Feb 2015 22:53:11 +0000 (11:53 +1300)
committerAndrew Bartlett <abartlet@samba.org>
Thu, 28 May 2015 05:25:07 +0000 (07:25 +0200)
Previously we could continue and fail due to attempting to de-reference this

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Garming Sam <garming@catalyst.net.nz>
source4/scripting/bin/samba_kcc

index 44c75dc197f8631d5130a5d7c3a787e61129f0b2..228f6c518dadc341ff80a9907c37289cb4c0c630 100755 (executable)
@@ -702,9 +702,9 @@ class KCC(object):
             if s_dnstr is not None:
                 s_dsa = self.get_dsa(s_dnstr)
 
-            # No DSA matching this source DN string?
-            if s_dsa is None:
-                return False, None
+        # No DSA matching this source DN string?
+        if s_dsa is None:
+            return False, None
 
         # To imply a repsFrom tuple is needed, each of these
         # must be True: