summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2004-09-25 11:19:29 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:59:13 -0500
commit998e8022b6d608840cf7c8058e24277b959da64d (patch)
tree2cd3db829b7671adca2664b40f4ee8ff6eaeb6e3 /source4
parentbdfc5db41d17c7eabba326f1e1e23790c72d9ba0 (diff)
downloadsamba-998e8022b6d608840cf7c8058e24277b959da64d.tar.gz
samba-998e8022b6d608840cf7c8058e24277b959da64d.tar.bz2
samba-998e8022b6d608840cf7c8058e24277b959da64d.zip
r2626: the symbol gai_error is defined in /usr/include, so don't use that name in our code
(This used to be commit 458f85328850905db8e9808d02898c69b5f9b872)
Diffstat (limited to 'source4')
-rw-r--r--source4/librpc/rpc/dcerpc_tcp.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/source4/librpc/rpc/dcerpc_tcp.c b/source4/librpc/rpc/dcerpc_tcp.c
index 0edc5226a6..170e84a763 100644
--- a/source4/librpc/rpc/dcerpc_tcp.c
+++ b/source4/librpc/rpc/dcerpc_tcp.c
@@ -284,7 +284,7 @@ NTSTATUS dcerpc_pipe_open_tcp(struct dcerpc_pipe **p,
int family)
{
struct tcp_private *tcp;
- int fd, gai_error;
+ int fd, gai_err;
struct fd_event fde;
struct addrinfo hints, *res, *tmpres;
char portname[16];
@@ -300,10 +300,10 @@ NTSTATUS dcerpc_pipe_open_tcp(struct dcerpc_pipe **p,
snprintf(portname, sizeof(portname)-1, "%d", port);
- gai_error = getaddrinfo(server, portname, &hints, &res);
- if (gai_error < 0)
+ gai_err = getaddrinfo(server, portname, &hints, &res);
+ if (gai_err < 0)
{
- DEBUG(0, ("Unable to connect to %s:%d : %s\n", server, port, gai_strerror(gai_error)));
+ DEBUG(0, ("Unable to connect to %s:%d : %s\n", server, port, gai_strerror(gai_err)));
return NT_STATUS_BAD_NETWORK_NAME;
}