samba-tool - MX records cannot be deleted (error in called C-program)
authorGuenter Kukkukk <kukks@samba.org>
Sun, 14 Apr 2013 04:17:28 +0000 (06:17 +0200)
committerAndrew Bartlett <abartlet@samba.org>
Sun, 14 Apr 2013 06:46:07 +0000 (08:46 +0200)
Only matching UNION-members should be compared. MX vs. SRV record

Signed-off-by: Guenter Kukkukk <kukks@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Autobuild-User(master): Andrew Bartlett <abartlet@samba.org>
Autobuild-Date(master): Sun Apr 14 08:46:07 CEST 2013 on sn-devel-104

source4/rpc_server/dnsserver/dnsdata.c

index 3dc7dccf288a73e72ef0f228e4efdfcd780a5363..09dba53aa03fd6bc74051013a7495302ab79d349 100644 (file)
@@ -971,7 +971,7 @@ bool dns_record_match(struct dnsp_DnssrvRpcRecord *rec1, struct dnsp_DnssrvRpcRe
 
        case DNS_TYPE_MX:
                return rec1->data.mx.wPriority == rec2->data.srv.wPriority &&
-                       dns_name_equal(rec1->data.mx.nameTarget, rec2->data.srv.nameTarget);
+                       dns_name_equal(rec1->data.mx.nameTarget, rec2->data.mx.nameTarget);
 
        case DNS_TYPE_TXT:
                if (rec1->data.txt.count != rec2->data.txt.count) {