openldap/openldap.patch

changeset 174
8998cbee3fc3
child 380
4f3b1ee715dd
     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/openldap/openldap.patch	Mon Apr 20 01:18:20 2009 +0200
     1.3 @@ -0,0 +1,52 @@
     1.4 +Index: include/ac/fdset.h
     1.5 +--- include/ac/fdset.h.orig	2008-02-12 00:26:40 +0100
     1.6 ++++ include/ac/fdset.h	2008-10-13 11:38:23 +0200
     1.7 +@@ -22,6 +22,13 @@
     1.8 + #ifndef _AC_FDSET_H
     1.9 + #define _AC_FDSET_H
    1.10 + 
    1.11 ++#if defined(HAVE_SYS_TYPES_H)
    1.12 ++#include <sys/types.h>
    1.13 ++#endif
    1.14 ++#if defined(HAVE_SYS_SELECT_H)
    1.15 ++#include <sys/select.h>
    1.16 ++#endif
    1.17 ++
    1.18 + #if !defined( OPENLDAP_FD_SETSIZE ) && !defined( FD_SETSIZE )
    1.19 + #  define OPENLDAP_FD_SETSIZE 4096
    1.20 + #endif
    1.21 +Index: include/ldap_int_thread.h
    1.22 +--- include/ldap_int_thread.h.orig	2008-02-12 00:26:40 +0100
    1.23 ++++ include/ldap_int_thread.h	2008-10-13 11:38:23 +0200
    1.24 +@@ -100,6 +100,7 @@
    1.25 +  *                                 *
    1.26 +  ***********************************/
    1.27 + 
    1.28 ++#define _POSIX_PTHREAD_SEMANTICS
    1.29 + #define PTH_SYSCALL_SOFT 1
    1.30 + #include <pth.h>
    1.31 + 
    1.32 +Index: libraries/libldap_r/tpool.c
    1.33 +--- libraries/libldap_r/tpool.c.orig	2008-03-21 01:46:03 +0100
    1.34 ++++ libraries/libldap_r/tpool.c	2008-10-13 11:38:23 +0200
    1.35 +@@ -950,6 +950,6 @@
    1.36 + {
    1.37 + 	ldap_int_thread_userctx_t *ctx = vctx;
    1.38 + 
    1.39 +-	return ctx->ltu_id;
    1.40 ++	return ctx != NULL ? ctx->ltu_id : 0;
    1.41 + }
    1.42 + #endif /* LDAP_THREAD_HAVE_TPOOL */
    1.43 +Index: servers/slapd/back-perl/config.c
    1.44 +--- servers/slapd/back-perl/config.c.orig	2008-02-12 00:26:47 +0100
    1.45 ++++ servers/slapd/back-perl/config.c	2008-10-13 11:38:23 +0200
    1.46 +@@ -49,6 +49,9 @@
    1.47 + 		}
    1.48 + 
    1.49 + #ifdef PERL_IS_5_6
    1.50 ++		if (argc > 2)
    1.51 ++		    snprintf( eval_str, EVAL_BUF_SIZE, "require \"%s\";", argv[2] );
    1.52 ++		else
    1.53 + 		snprintf( eval_str, EVAL_BUF_SIZE, "use %s;", argv[1] );
    1.54 + 		eval_pv( eval_str, 0 );
    1.55 + 

mercurial