Skip to content
GitLab
Commits (2)
Hide whitespace changes
Inline Side-by-side
CHANGES
View file @ c1326073
OpenLDAP 2.5 Change Log OpenLDAP 2.5 Change Log
OpenLDAP 2.5.10 Engineering OpenLDAP 2.5.10 Engineering
Fixed libldap to init client socket port (ITS#9743)
OpenLDAP 2.5.9 Release (2021/10/25) OpenLDAP 2.5.9 Release (2021/10/25)
Fixed slapo-accesslog to initialize minCSN on import of 2.4 databases (ITS#9720) Fixed slapo-accesslog to initialize minCSN on import of 2.4 databases (ITS#9720)
......
libraries/libldap/os-ip.c
View file @ c1326073
...@@ -263,7 +263,7 @@ ldap_pvt_is_socket_ready(LDAP *ld, int s) ...@@ -263,7 +263,7 @@ ldap_pvt_is_socket_ready(LDAP *ld, int s)
== AC_SOCKET_ERROR ) == AC_SOCKET_ERROR )
{ {
/* XXX: needs to be replace with ber_stream_read() */ /* XXX: needs to be replace with ber_stream_read() */
(void)read(s, &ch, 1); (void)!read(s, &ch, 1);
TRACE; TRACE;
return -1; return -1;
} }
...@@ -697,6 +697,7 @@ ldap_connect_to_host(LDAP *ld, Sockbuf *sb, ...@@ -697,6 +697,7 @@ ldap_connect_to_host(LDAP *ld, Sockbuf *sb,
struct sockaddr_in6 ip6addr; struct sockaddr_in6 ip6addr;
char bind_addr[INET6_ADDRSTRLEN]; char bind_addr[INET6_ADDRSTRLEN];
ip6addr.sin6_family = AF_INET6; ip6addr.sin6_family = AF_INET6;
ip6addr.sin6_port = 0;
ip6addr.sin6_addr = ld->ld_options.ldo_local_ip_addrs.ip6_addr; ip6addr.sin6_addr = ld->ld_options.ldo_local_ip_addrs.ip6_addr;
inet_ntop( AF_INET6, inet_ntop( AF_INET6,
&(ip6addr.sin6_addr), &(ip6addr.sin6_addr),
...@@ -725,6 +726,7 @@ ldap_connect_to_host(LDAP *ld, Sockbuf *sb, ...@@ -725,6 +726,7 @@ ldap_connect_to_host(LDAP *ld, Sockbuf *sb,
struct sockaddr_in ip4addr; struct sockaddr_in ip4addr;
char bind_addr[INET_ADDRSTRLEN]; char bind_addr[INET_ADDRSTRLEN];
ip4addr.sin_family = AF_INET; ip4addr.sin_family = AF_INET;
ip4addr.sin_port = 0;
ip4addr.sin_addr = ld->ld_options.ldo_local_ip_addrs.ip4_addr; ip4addr.sin_addr = ld->ld_options.ldo_local_ip_addrs.ip4_addr;
inet_ntop( AF_INET, inet_ntop( AF_INET,
&(ip4addr.sin_addr), &(ip4addr.sin_addr),
......