r20427: Rename dnp_open. This conflicts with the dns_open symbol in

libSystem on Mac OS X.

diff --git a/source/libaddns/dns.h b/source/libaddns/dns.h
index 1240174076144d29508eb76fa010a02362b8adb8..9e8cc1d1558418038de1184ccb03f1215d9d4c43 100644 (file)
--- a/source/libaddns/dns.h
+++ b/source/libaddns/dns.h
@@ -426,7 +426,7 @@ DNS_ERROR dns_add_rrec(TALLOC_CTX *mem_ctx, struct dns_rrec *rec,
 
 /* from dnssock.c */
 
-DNS_ERROR dns_open( const char *nameserver, int32 dwType,
+DNS_ERROR dns_open_connection( const char *nameserver, int32 dwType,
                    TALLOC_CTX *mem_ctx,
                    struct dns_connection **conn );
 DNS_ERROR dns_send(struct dns_connection *conn, const struct dns_buffer *buf);

diff --git a/source/libaddns/dnsgss.c b/source/libaddns/dnsgss.c
index 5be13a3b7715f1535d9d93e91c35a87f9018382e..798fd4404ee34fc35f595f2ae3be04ca1f24d8af 100644 (file)
--- a/source/libaddns/dnsgss.c
+++ b/source/libaddns/dnsgss.c
@@ -233,7 +233,7 @@ DNS_ERROR dns_negotiate_sec_ctx( const char *target_realm,
                return ERROR_DNS_NO_MEMORY;
        }
 
-       err = dns_open( servername, DNS_TCP, mem_ctx, &conn );
+       err = dns_open_connection( servername, DNS_TCP, mem_ctx, &conn );
        if (!ERR_DNS_IS_OK(err)) goto error;
 
        if (!(upcaserealm = talloc_strdup(mem_ctx, target_realm))) {

diff --git a/source/libaddns/dnssock.c b/source/libaddns/dnssock.c
index 597a7ebf07934f2521d41c0c4d1c10addba24383..2f48df1bbd1846794d0920ef81e4dd102d3322b2 100644 (file)
--- a/source/libaddns/dnssock.c
+++ b/source/libaddns/dnssock.c
@@ -134,7 +134,7 @@ static DNS_ERROR dns_udp_open( const char *nameserver,
 /********************************************************************
 ********************************************************************/
 
-DNS_ERROR dns_open( const char *nameserver, int32 dwType,
+DNS_ERROR dns_open_connection( const char *nameserver, int32 dwType,
                    TALLOC_CTX *mem_ctx,
                    struct dns_connection **conn )
 {