Author: jpeach Date: 2006-12-31 06:45:24 +0000 (Sun, 31 Dec 2006) New Revision: 20427
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=20427 Log: Rename dnp_open. This conflicts with the dns_open symbol in libSystem on Mac OS X. Modified: branches/SAMBA_3_0/source/libaddns/dns.h branches/SAMBA_3_0/source/libaddns/dnsgss.c branches/SAMBA_3_0/source/libaddns/dnssock.c Changeset: Modified: branches/SAMBA_3_0/source/libaddns/dns.h =================================================================== --- branches/SAMBA_3_0/source/libaddns/dns.h 2006-12-31 02:22:39 UTC (rev 20426) +++ branches/SAMBA_3_0/source/libaddns/dns.h 2006-12-31 06:45:24 UTC (rev 20427) @@ -426,7 +426,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/source/libaddns/dnsgss.c =================================================================== --- branches/SAMBA_3_0/source/libaddns/dnsgss.c 2006-12-31 02:22:39 UTC (rev 20426) +++ branches/SAMBA_3_0/source/libaddns/dnsgss.c 2006-12-31 06:45:24 UTC (rev 20427) @@ -233,7 +233,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/source/libaddns/dnssock.c =================================================================== --- branches/SAMBA_3_0/source/libaddns/dnssock.c 2006-12-31 02:22:39 UTC (rev 20426) +++ branches/SAMBA_3_0/source/libaddns/dnssock.c 2006-12-31 06:45:24 UTC (rev 20427) @@ -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 ) {