svn commit: samba r20428 - in branches/SAMBA_3_0/source/utils: .

jpeach at samba.org jpeach at samba.org
Sun Dec 31 06:50:47 GMT 2006


Author: jpeach
Date: 2006-12-31 06:50:44 +0000 (Sun, 31 Dec 2006)
New Revision: 20428

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

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

Modified:
   branches/SAMBA_3_0/source/utils/net_dns.c


Changeset:
Modified: branches/SAMBA_3_0/source/utils/net_dns.c
===================================================================
--- branches/SAMBA_3_0/source/utils/net_dns.c	2006-12-31 06:45:24 UTC (rev 20427)
+++ branches/SAMBA_3_0/source/utils/net_dns.c	2006-12-31 06:50:44 UTC (rev 20428)
@@ -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;
 	}
@@ -166,7 +166,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);



More information about the samba-cvs mailing list