[SCM] Samba Shared Repository - branch master updated

[Andrew Bartlett]

The branch, master has been updated
       via  f67ae78 samba-tool - MX records cannot be deleted (part2)
      from  3434140 samba-tool - MX records cannot be deleted (error in called C-program)

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


- Log -----------------------------------------------------------------
commit f67ae788cf8a678af0e309c8527f2b25c98b557b
Author: Guenter Kukkukk <kukks at samba.org>
Date:   Sun Apr 14 19:39:02 2013 +0200

    samba-tool - MX records cannot be deleted (part2)
    
    I missed this one, also a wrong compare of 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 22:43: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 09dba53..f0584a9 100644
--- a/source4/rpc_server/dnsserver/dnsdata.c
+++ b/source4/rpc_server/dnsserver/dnsdata.c
@@ -970,7 +970,7 @@ bool dns_record_match(struct dnsp_DnssrvRpcRecord *rec1, struct dnsp_DnssrvRpcRe
 		return dns_name_equal(rec1->data.ptr, rec2->data.ptr);
 
 	case DNS_TYPE_MX:
-		return rec1->data.mx.wPriority == rec2->data.srv.wPriority &&
+		return rec1->data.mx.wPriority == rec2->data.mx.wPriority &&
 			dns_name_equal(rec1->data.mx.nameTarget, rec2->data.mx.nameTarget);
 
 	case DNS_TYPE_TXT:


-- 
Samba Shared Repository