kcc: sort guids by ndr_pack representation
authorDouglas Bagnall <douglas.bagnall@catalyst.net.nz>
Fri, 13 Mar 2015 03:39:00 +0000 (16:39 +1300)
committerAndrew Bartlett <abartlet@samba.org>
Fri, 29 May 2015 04:58:24 +0000 (06:58 +0200)
This gives the correct rings in intrasite.

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

index 5ecc20d924dc0b0be5370a5086702b52af473003..44e3136214a0ee3866a9a93dcc52fc6cfc31f881 100755 (executable)
@@ -2778,7 +2778,7 @@ class KCC(object):
 # Global Functions
 ##################################################
 def sort_replica_by_dsa_guid(rep1, rep2):
-    return cmp(rep1.rep_dsa_guid, rep2.rep_dsa_guid)
+    return cmp(ndr_pack(rep1.rep_dsa_guid), ndr_pack(rep2.rep_dsa_guid))
 
 def sort_dsa_by_gc_and_guid(dsa1, dsa2):
     if dsa1.is_gc() and not dsa2.is_gc():