summaryrefslogtreecommitdiff
path: root/source4/libcli
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2005-02-10 07:39:14 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:09:40 -0500
commit75ddf59ea110117578acd3a7b889549bfb40473c (patch)
tree426a4ad58c5e827c846b6a3f1ace4bbbf8749d03 /source4/libcli
parenta5bd1ccadab723c531963c219a1ac2b6b0c8b845 (diff)
downloadsamba-75ddf59ea110117578acd3a7b889549bfb40473c.tar.gz
samba-75ddf59ea110117578acd3a7b889549bfb40473c.tar.bz2
samba-75ddf59ea110117578acd3a7b889549bfb40473c.zip
r5308: trimmed back a lot of the old macros from smb_macros.h
(This used to be commit bf43c9bdcf9e654d123f6a2b29feb9189ca9e561)
Diffstat (limited to 'source4/libcli')
-rw-r--r--source4/libcli/ldap/ldap_client.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source4/libcli/ldap/ldap_client.c b/source4/libcli/ldap/ldap_client.c
index 11815ddd6d..e3904c7a6b 100644
--- a/source4/libcli/ldap/ldap_client.c
+++ b/source4/libcli/ldap/ldap_client.c
@@ -223,7 +223,7 @@ static int open_socket_out(int type, struct ipv4_addr *addr, int port, int timeo
if (type != SOCK_STREAM) return(res);
memset((char *)&sock_out,'\0',sizeof(sock_out));
- putip((char *)&sock_out.sin_addr,(char *)addr);
+ sock_out.sin_addr.s_addr = addr->addr;
sock_out.sin_port = htons( port );
sock_out.sin_family = PF_INET;
@@ -385,7 +385,7 @@ struct ldap_connection *ldap_connect(TALLOC_CTX *mem_ctx, const char *url)
return NULL;
}
- putip((char *)&ip, (char *)hp->h_addr);
+ memcpy((char *)&ip, (char *)hp->h_addr, 4);
conn->sock = open_socket_out(SOCK_STREAM, &ip, conn->port, LDAP_CONNECTION_TIMEOUT);
if (conn->sock < 0) {