[SCM] Samba Shared Repository - branch master updated

[Andrew Bartlett]

The branch, master has been updated
       via  3434140 samba-tool - MX records cannot be deleted (error in called C-program)
      from  41333f9 ntdb: remove --disable-ntdb.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 3434140c0959d9608f9a4636df2060d00ac9b518
Author: Guenter Kukkukk <kukks at samba.org>
Date:   Sun Apr 14 06:17:28 2013 +0200

    samba-tool - MX records cannot be deleted (error in called C-program)
    
    Only matching UNION-members should be compared. MX vs. SRV record
    
    Signed-off-by: Guenter Kukkukk <kukks at samba.org>
    
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    
    Autobuild-User(master): Andrew Bartlett <abartlet at samba.org>
    Autobuild-Date(master): Sun Apr 14 08:46:07 CEST 2013 on sn-devel-104

-----------------------------------------------------------------------

Summary of changes:
 source4/rpc_server/dnsserver/dnsdata.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/rpc_server/dnsserver/dnsdata.c b/source4/rpc_server/dnsserver/dnsdata.c
index 3dc7dcc..09dba53 100644
--- a/source4/rpc_server/dnsserver/dnsdata.c
+++ b/source4/rpc_server/dnsserver/dnsdata.c
@@ -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) {


-- 
Samba Shared Repository