diff options
| author | Oliver Eikemeier <eik@FreeBSD.org> | 2003-11-14 03:57:13 +0000 |
|---|---|---|
| committer | Oliver Eikemeier <eik@FreeBSD.org> | 2003-11-14 03:57:13 +0000 |
| commit | df15f5fedf93ebb5a0f6c59931c9140680410aae (patch) | |
| tree | 2d8e33442ac49d46b6a6f74dcbc9c07fcd5326dc /net/openldap20-server/files/patch-servers::slapd::daemon.c | |
| parent | Update to 20031029. (diff) | |
** NOTICE: **
* OpenLDAP 2.0 is no longer actively maintained by the OpenLDAP Project.
* You are strongly encouraged to update to OpenLDAP 2.1
* Port maintainers: Please respect the default in bsd.port.mk
* I plan to remove OpenLDAP 2.0 from the FreeBSD ports tree May 2004
- Update net/openldap21-client and net/openldap21-server to version 2.1.23
- Update net/openldap22-client and net/openldap22-server to version 2.2.2.b,
fix ITS#2747 from CVS
- some fixes for net/openldap20-server from CVS, seems like there won't be
a 2.0.28 release anymore
- remove conflict with deleted port net/openldap12
- use PORTDOCS
- use USE_OPENSSL
- don't use _REENTRANT
- add a deinstall message
PR: 58278
Submitted by: me
Approved by: marcus (mentor)
Diffstat (limited to '')
| -rw-r--r-- | net/openldap20-server/files/patch-servers::slapd::daemon.c | 33 |
1 files changed, 13 insertions, 20 deletions
diff --git a/net/openldap20-server/files/patch-servers::slapd::daemon.c b/net/openldap20-server/files/patch-servers::slapd::daemon.c index 75fced252e07..efa32eaf6c79 100644 --- a/net/openldap20-server/files/patch-servers::slapd::daemon.c +++ b/net/openldap20-server/files/patch-servers::slapd::daemon.c @@ -1,28 +1,21 @@ ---- servers/slapd/daemon.c.orig Thu Apr 24 07:51:08 2003 -+++ servers/slapd/daemon.c Thu Apr 24 07:52:05 2003 -@@ -863,6 +863,7 @@ - - char *dnsname = NULL; - char *peeraddr; -+ char peeraddr6[INET6_ADDRSTRLEN]; - #ifdef LDAP_PF_LOCAL - char peername[MAXPATHLEN + sizeof("PATH=")]; - #elif defined(LDAP_PF_INET6) -@@ -995,12 +996,12 @@ - peeraddr != NULL ? peeraddr : "unknown", +# +# ITS#1918: slapd panics with real ipv6 addresses +# +--- servers/slapd/daemon.c.orig Tue Sep 23 17:21:54 2003 ++++ servers/slapd/daemon.c Tue Sep 23 17:25:02 2003 +@@ -996,10 +996,12 @@ (unsigned) ntohs( from.sa_in6_addr.sin6_port ) ); } else { -- char addr[INET6_ADDRSTRLEN]; -- sprintf( peername, "IP=%s %d", + char addr[INET6_ADDRSTRLEN]; ++ ++ peeraddr = (char *) inet_ntop( AF_INET6, ++ &from.sa_in6_addr.sin6_addr, ++ addr, sizeof addr ); + sprintf( peername, "IP=%s %d", - inet_ntop( AF_INET6, - &from.sa_in6_addr.sin6_addr, - addr, sizeof addr) ? addr : "unknown", -+ const char *addr = inet_ntop( AF_INET6, -+ &from.sa_in6_addr.sin6_addr, -+ peeraddr6, sizeof peeraddr6); -+ sprintf( peername, "IP=%s %d", addr ? addr : "unknown", ++ peeraddr != NULL ? peeraddr : "unknown", (unsigned) ntohs( from.sa_in6_addr.sin6_port ) ); -+ if (addr) peeraddr = addr; } break; - # endif /* LDAP_PF_INET6 */ |