kcc: Change create_connection to properly query existing connections

Originally it didn't correctly detect the right 'from server' continuing
with any connection.

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

diff --git a/source4/scripting/bin/samba_kcc b/source4/scripting/bin/samba_kcc
index 6ec528d6bafd5e95e209ae06e3b8d34998474849..dcac5aba68871471f3b7292d9b27b3848c8e088d 100755 (executable)
--- a/source4/scripting/bin/samba_kcc
+++ b/source4/scripting/bin/samba_kcc
@@ -1339,11 +1339,13 @@ class KCC(object):
             for cn in ldsa.connect_table.values():
 
                 rdsa = None
+                found = False
                 for rdsa in rbhs_all:
                     if cn.from_dnstr == rdsa.dsa_dnstr:
+                        found = True
                         break
 
-                if rdsa is None:
+                if rdsa is None or not found:
                     continue
 
                 DEBUG_DARK_YELLOW("rdsa is %s" % rdsa.dsa_dnstr)
@@ -1462,12 +1464,15 @@ class KCC(object):
             for cn in ldsa.connect_table.values():
 
                 rdsa = None
+                found = False
                 for rdsa in rbhs_all:
                     if cn.from_dnstr == rdsa.dsa_dnstr:
+                        found = True
                         break
 
-                if rdsa is None:
+                if rdsa is None or not found:
                     continue
+
                 DEBUG_DARK_YELLOW("round 2: rdsa is %s" % rdsa.dsa_dnstr)
 
                 # IF (bit NTDSCONN_OPT_IS_GENERATED is clear in cn!options or