svn commit: r395815 - in head/net/openldap24-server: . files

Xin LI delphij at FreeBSD.org
Wed Sep 2 01:46:16 UTC 2015


Author: delphij
Date: Wed Sep  2 01:46:15 2015
New Revision: 395815
URL: https://svnweb.freebsd.org/changeset/ports/395815

Log:
  Use sa_len instead of sizeof(struct sockaddr_storage) to work around a
  FreeBSD kernel check, which would return EINVAL when the passed length
  is larger than desired.
  
  PR:		ports/202819
  Submitted by:	brd

Added:
  head/net/openldap24-server/files/patch-libraries__liblber__sockbuf.c   (contents, props changed)
Modified:
  head/net/openldap24-server/Makefile

Modified: head/net/openldap24-server/Makefile
==============================================================================
--- head/net/openldap24-server/Makefile	Wed Sep  2 01:15:11 2015	(r395814)
+++ head/net/openldap24-server/Makefile	Wed Sep  2 01:46:15 2015	(r395815)
@@ -56,8 +56,8 @@ WANT_OPENLDAP_VER?=	24
 BROKEN=			incompatible OpenLDAP version: ${WANT_OPENLDAP_VER}
 .endif
 
-PORTREVISION_CLIENT=	0
-PORTREVISION_SERVER=	0
+PORTREVISION_CLIENT=	1
+PORTREVISION_SERVER=	1
 OPENLDAP_SHLIB_MAJOR=	2
 OPENLDAP_SHLIB_MINOR=	10.4
 OPENLDAP_MAJOR=		${DISTVERSION:R}

Added: head/net/openldap24-server/files/patch-libraries__liblber__sockbuf.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/openldap24-server/files/patch-libraries__liblber__sockbuf.c	Wed Sep  2 01:46:15 2015	(r395815)
@@ -0,0 +1,12 @@
+--- libraries/liblber/sockbuf.c.orig	2015-09-01 16:43:54.707637190 -0600
++++ libraries/liblber/sockbuf.c	2015-09-01 17:16:22.310503263 -0600
+@@ -937,8 +937,7 @@
+ 	buf = (char *) buf + sizeof( struct sockaddr_storage );
+ 	len -= sizeof( struct sockaddr_storage );
+    
+-	rc = sendto( sbiod->sbiod_sb->sb_fd, buf, len, 0, dst,
+-		sizeof( struct sockaddr_storage ) );
++	rc = sendto( sbiod->sbiod_sb->sb_fd, buf, len, 0, dst, dst->sa_len );
+ 
+ 	if ( rc < 0 ) return -1;
+    


More information about the svn-ports-head mailing list