svn commit: samba r20431 - in branches/SAMBA_3_0_24/source: libaddns utils

[jpeach at samba.org]

Author: jpeach
Date: 2006-12-31 07:19:22 +0000 (Sun, 31 Dec 2006)
New Revision: 20431

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=20431

Log:
svn merge branches/SAMBA_3_0 -r 20426:20428 .

Rename dns_open. This conflicts with the dns_open symbol in
libSystem on Mac OS X.

Modified:
   branches/SAMBA_3_0_24/source/libaddns/dns.h
   branches/SAMBA_3_0_24/source/libaddns/dnsgss.c
   branches/SAMBA_3_0_24/source/libaddns/dnssock.c
   branches/SAMBA_3_0_24/source/utils/net_dns.c


Changeset:
Modified: branches/SAMBA_3_0_24/source/libaddns/dns.h
===================================================================
--- branches/SAMBA_3_0_24/source/libaddns/dns.h	2006-12-31 07:18:01 UTC (rev 20430)
+++ branches/SAMBA_3_0_24/source/libaddns/dns.h	2006-12-31 07:19:22 UTC (rev 20431)
@@ -427,7 +427,7 @@
 
 /* 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);

Modified: branches/SAMBA_3_0_24/source/libaddns/dnsgss.c
===================================================================
--- branches/SAMBA_3_0_24/source/libaddns/dnsgss.c	2006-12-31 07:18:01 UTC (rev 20430)
+++ branches/SAMBA_3_0_24/source/libaddns/dnsgss.c	2006-12-31 07:19:22 UTC (rev 20431)
@@ -218,7 +218,7 @@
 		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))) {

Modified: branches/SAMBA_3_0_24/source/libaddns/dnssock.c
===================================================================
--- branches/SAMBA_3_0_24/source/libaddns/dnssock.c	2006-12-31 07:18:01 UTC (rev 20430)
+++ branches/SAMBA_3_0_24/source/libaddns/dnssock.c	2006-12-31 07:19:22 UTC (rev 20431)
@@ -134,7 +134,7 @@
 /********************************************************************
 ********************************************************************/
 
-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 )
 {

Modified: branches/SAMBA_3_0_24/source/utils/net_dns.c
===================================================================
--- branches/SAMBA_3_0_24/source/utils/net_dns.c	2006-12-31 07:18:01 UTC (rev 20430)
+++ branches/SAMBA_3_0_24/source/utils/net_dns.c	2006-12-31 07:19:22 UTC (rev 20431)
@@ -48,7 +48,7 @@
 		return ERROR_DNS_NO_MEMORY;
 	}
 		
-	err = dns_open( pszServerName, DNS_TCP, mem_ctx, &conn );
+	err = dns_open_connection( pszServerName, DNS_TCP, mem_ctx, &conn );
 	if (!ERR_DNS_IS_OK(err)) {
 		goto error;
 	}
@@ -176,7 +176,7 @@
 	struct dns_request *req, *resp;
 	DNS_ERROR err;
 
-	err = dns_open(server, DNS_UDP, NULL, &conn);
+	err = dns_open_connection(server, DNS_UDP, NULL, &conn);
 	if (!ERR_DNS_IS_OK(err)) goto error;
 
 	err = dns_create_query(conn, host, QTYPE_A, DNS_CLASS_IN, &req);