diff options
| author | James Peach <jpeach@samba.org> | 2006-12-31 06:45:24 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:16:48 -0500 |
| commit | 1beb6f6038560920dcb6944993bf1d28b238598a (patch) | |
| tree | fb071c5a3ca29e5ec2f0302e51fc68e0bd2374a8 /source3/libaddns | |
| parent | 6d1607f4d71906121f3b0495a811ed99a3f8331e (diff) | |
| download | samba-1beb6f6038560920dcb6944993bf1d28b238598a.tar.gz samba-1beb6f6038560920dcb6944993bf1d28b238598a.tar.bz2 samba-1beb6f6038560920dcb6944993bf1d28b238598a.zip | |
r20427: Rename dnp_open. This conflicts with the dns_open symbol in
libSystem on Mac OS X.
(This used to be commit 585ee7f31d2fb169e9dc37fd786faa8049be5e52)
Diffstat (limited to 'source3/libaddns')
| -rw-r--r-- | source3/libaddns/dns.h | 2 | ||||
| -rw-r--r-- | source3/libaddns/dnsgss.c | 2 | ||||
| -rw-r--r-- | source3/libaddns/dnssock.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/source3/libaddns/dns.h b/source3/libaddns/dns.h index 1240174076..9e8cc1d155 100644 --- a/source3/libaddns/dns.h +++ b/source3/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/source3/libaddns/dnsgss.c b/source3/libaddns/dnsgss.c index 5be13a3b77..798fd4404e 100644 --- a/source3/libaddns/dnsgss.c +++ b/source3/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/source3/libaddns/dnssock.c b/source3/libaddns/dnssock.c index 597a7ebf07..2f48df1bbd 100644 --- a/source3/libaddns/dnssock.c +++ b/source3/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 ) { |