openldap/openldap.patch@300d43423c2e (annotated)
openldap/openldap.patch
Wed, 08 Feb 2012 20:07:00 +0200
- author
- Michael Schloh von Bennewitz <michael@schloh.com>
- date
- Wed, 08 Feb 2012 20:07:00 +0200
- changeset 588
- 300d43423c2e
- parent 586
- e10b124b2f21
- child 777
- 4e2fe5febd48
- permissions
- -rw-r--r--
Update version, adapt patch, correct PID writing, correct build on newer
FreeBSD releases, and most importantly introduce new patch to try to
avoid segfault caused by multiple network interfaces with the same (or
no) address. This is common when configuring bridges and tunnels.
| michael@174 | 1 | Index: include/ac/fdset.h |
| michael@586 | 2 | --- include/ac/fdset.h.orig 2011-11-25 19:52:29.000000000 +0100 |
| michael@586 | 3 | +++ include/ac/fdset.h 2011-12-11 14:01:59.000000000 +0100 |
| michael@174 | 4 | @@ -22,6 +22,13 @@ |
| michael@174 | 5 | #ifndef _AC_FDSET_H |
| michael@174 | 6 | #define _AC_FDSET_H |
| michael@174 | 7 | |
| michael@174 | 8 | +#if defined(HAVE_SYS_TYPES_H) |
| michael@174 | 9 | +#include <sys/types.h> |
| michael@174 | 10 | +#endif |
| michael@174 | 11 | +#if defined(HAVE_SYS_SELECT_H) |
| michael@174 | 12 | +#include <sys/select.h> |
| michael@174 | 13 | +#endif |
| michael@174 | 14 | + |
| michael@174 | 15 | #if !defined( OPENLDAP_FD_SETSIZE ) && !defined( FD_SETSIZE ) |
| michael@174 | 16 | # define OPENLDAP_FD_SETSIZE 4096 |
| michael@174 | 17 | #endif |
| michael@174 | 18 | Index: include/ldap_int_thread.h |
| michael@586 | 19 | --- include/ldap_int_thread.h.orig 2011-11-25 19:52:29.000000000 +0100 |
| michael@586 | 20 | +++ include/ldap_int_thread.h 2011-12-11 14:01:59.000000000 +0100 |
| michael@380 | 21 | @@ -110,6 +110,7 @@ |
| michael@174 | 22 | * * |
| michael@174 | 23 | ***********************************/ |
| michael@174 | 24 | |
| michael@174 | 25 | +#define _POSIX_PTHREAD_SEMANTICS |
| michael@174 | 26 | #define PTH_SYSCALL_SOFT 1 |
| michael@174 | 27 | #include <pth.h> |
| michael@174 | 28 | |
| michael@174 | 29 | Index: libraries/libldap_r/tpool.c |
| michael@586 | 30 | --- libraries/libldap_r/tpool.c.orig 2011-11-25 19:52:29.000000000 +0100 |
| michael@586 | 31 | +++ libraries/libldap_r/tpool.c 2011-12-11 14:01:59.000000000 +0100 |
| michael@587 | 32 | @@ -968,6 +968,6 @@ |
| michael@174 | 33 | { |
| michael@174 | 34 | ldap_int_thread_userctx_t *ctx = vctx; |
| michael@174 | 35 | |
| michael@174 | 36 | - return ctx->ltu_id; |
| michael@174 | 37 | + return ctx != NULL ? ctx->ltu_id : 0; |
| michael@174 | 38 | } |
| michael@174 | 39 | #endif /* LDAP_THREAD_HAVE_TPOOL */ |
| michael@586 | 40 | Index: libraries/libmdb/mdb.c |
| michael@586 | 41 | --- libraries/libmdb/mdb.c.orig 2011-11-25 19:52:29.000000000 +0100 |
| michael@586 | 42 | +++ libraries/libmdb/mdb.c 2011-12-11 14:01:59.000000000 +0100 |
| michael@587 | 43 | @@ -198,7 +198,11 @@ |
| michael@586 | 44 | * Otherwise compile with the less efficient -DMDB_DSYNC=O_SYNC. |
| michael@586 | 45 | */ |
| michael@586 | 46 | #ifndef MDB_DSYNC |
| michael@586 | 47 | -# define MDB_DSYNC O_DSYNC |
| michael@586 | 48 | +# ifdef O_DSYNC |
| michael@586 | 49 | +# define MDB_DSYNC O_DSYNC |
| michael@586 | 50 | +# else |
| michael@586 | 51 | +# define MDB_DSYNC O_SYNC |
| michael@586 | 52 | +# endif |
| michael@586 | 53 | #endif |
| michael@586 | 54 | #endif |
| michael@586 | 55 | |
| michael@174 | 56 | Index: servers/slapd/back-perl/config.c |
| michael@586 | 57 | --- servers/slapd/back-perl/config.c.orig 2011-11-25 19:52:29.000000000 +0100 |
| michael@586 | 58 | +++ servers/slapd/back-perl/config.c 2011-12-11 14:02:56.000000000 +0100 |
| michael@586 | 59 | @@ -173,6 +173,9 @@ |
| michael@586 | 60 | } else { |
| michael@586 | 61 | switch( c->type ) { |
| michael@586 | 62 | case PERL_MODULE: |
| michael@586 | 63 | + if (c->argc > 2) |
| michael@586 | 64 | + snprintf( eval_str, EVAL_BUF_SIZE, "require \"%s\";", c->argv[2] ); |
| michael@586 | 65 | + else |
| michael@586 | 66 | snprintf( eval_str, EVAL_BUF_SIZE, "use %s;", c->argv[1] ); |
| michael@586 | 67 | eval_pv( eval_str, 0 ); |
| michael@174 | 68 |
