[SCM] Samba Shared Repository - branch master updated

[Amitay Isaacs]

The branch, master has been updated
       via  a35da79 s4-rpc: dnsserver: Fix the typo in comparing two DNS records
      from  89b4138 s3:rpc_server: initialize struct schannel_state to zero

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


- Log -----------------------------------------------------------------
commit a35da7972e070a7d22db7d79bba70f07e14b4fcd
Author: Amitay Isaacs <ami...@gmail.com>
Date:   Fri Mar 2 17:56:24 2012 +1100

    s4-rpc: dnsserver: Fix the typo in comparing two DNS records
    
    Autobuild-User: Amitay Isaacs <ami...@samba.org>
    Autobuild-Date: Fri Mar  2 10:27:41 CET 2012 on sn-devel-104

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

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


Changeset truncated at 500 lines:

diff --git a/source4/rpc_server/dnsserver/dnsdata.c 
b/source4/rpc_server/dnsserver/dnsdata.c
index c8ac58d..3dc7dcc 100644
--- a/source4/rpc_server/dnsserver/dnsdata.c
+++ b/source4/rpc_server/dnsserver/dnsdata.c
@@ -952,10 +952,10 @@ bool dns_record_match(struct dnsp_DnssrvRpcRecord *rec1, 
struct dnsp_DnssrvRpcRe
                return strcmp(rec1->data.ipv4, rec2->data.ipv4) == 0;
 
        case DNS_TYPE_NS:
-               return dns_name_equal(rec1->data.ns, rec1->data.ns);
+               return dns_name_equal(rec1->data.ns, rec2->data.ns);
 
        case DNS_TYPE_CNAME:
-               return dns_name_equal(rec1->data.cname, rec1->data.cname);
+               return dns_name_equal(rec1->data.cname, rec2->data.cname);
 
        case DNS_TYPE_SOA:
                return dns_name_equal(rec1->data.soa.mname, 
rec2->data.soa.mname) == 0 &&


-- 
Samba Shared Repository