comparison: openldap/openldap.patch
openldap/openldap.patch
- changeset 586
- e10b124b2f21
- parent 380
- 4f3b1ee715dd
- child 587
- d0df67c21897
equal
deleted
inserted
replaced
| 1:c8f381a6dcc3 | 2:0f18cceacd30 |
|---|---|
| 1 Index: include/ac/fdset.h | 1 Index: include/ac/fdset.h |
| 2 --- include/ac/fdset.h.orig 2011-01-05 00:49:56.000000000 +0100 | 2 --- include/ac/fdset.h.orig 2011-11-25 19:52:29.000000000 +0100 |
| 3 +++ include/ac/fdset.h 2011-02-12 10:17:43.000000000 +0100 | 3 +++ include/ac/fdset.h 2011-12-11 14:01:59.000000000 +0100 |
| 4 @@ -22,6 +22,13 @@ | 4 @@ -22,6 +22,13 @@ |
| 5 #ifndef _AC_FDSET_H | 5 #ifndef _AC_FDSET_H |
| 6 #define _AC_FDSET_H | 6 #define _AC_FDSET_H |
| 7 | 7 |
| 8 +#if defined(HAVE_SYS_TYPES_H) | 8 +#if defined(HAVE_SYS_TYPES_H) |
| 14 + | 14 + |
| 15 #if !defined( OPENLDAP_FD_SETSIZE ) && !defined( FD_SETSIZE ) | 15 #if !defined( OPENLDAP_FD_SETSIZE ) && !defined( FD_SETSIZE ) |
| 16 # define OPENLDAP_FD_SETSIZE 4096 | 16 # define OPENLDAP_FD_SETSIZE 4096 |
| 17 #endif | 17 #endif |
| 18 Index: include/ldap_int_thread.h | 18 Index: include/ldap_int_thread.h |
| 19 --- include/ldap_int_thread.h.orig 2011-01-06 19:43:20.000000000 +0100 | 19 --- include/ldap_int_thread.h.orig 2011-11-25 19:52:29.000000000 +0100 |
| 20 +++ include/ldap_int_thread.h 2011-02-12 10:17:43.000000000 +0100 | 20 +++ include/ldap_int_thread.h 2011-12-11 14:01:59.000000000 +0100 |
| 21 @@ -110,6 +110,7 @@ | 21 @@ -110,6 +110,7 @@ |
| 22 * * | 22 * * |
| 23 ***********************************/ | 23 ***********************************/ |
| 24 | 24 |
| 25 +#define _POSIX_PTHREAD_SEMANTICS | 25 +#define _POSIX_PTHREAD_SEMANTICS |
| 26 #define PTH_SYSCALL_SOFT 1 | 26 #define PTH_SYSCALL_SOFT 1 |
| 27 #include <pth.h> | 27 #include <pth.h> |
| 28 | 28 |
| 29 Index: libraries/libldap_r/tpool.c | 29 Index: libraries/libldap_r/tpool.c |
| 30 --- libraries/libldap_r/tpool.c.orig 2011-01-05 00:50:08.000000000 +0100 | 30 --- libraries/libldap_r/tpool.c.orig 2011-11-25 19:52:29.000000000 +0100 |
| 31 +++ libraries/libldap_r/tpool.c 2011-02-12 10:17:43.000000000 +0100 | 31 +++ libraries/libldap_r/tpool.c 2011-12-11 14:01:59.000000000 +0100 |
| 32 @@ -968,6 +968,6 @@ | 32 @@ -1019,6 +1019,6 @@ |
| 33 { | 33 { |
| 34 ldap_int_thread_userctx_t *ctx = vctx; | 34 ldap_int_thread_userctx_t *ctx = vctx; |
| 35 | 35 |
| 36 - return ctx->ltu_id; | 36 - return ctx->ltu_id; |
| 37 + return ctx != NULL ? ctx->ltu_id : 0; | 37 + return ctx != NULL ? ctx->ltu_id : 0; |
| 38 } | 38 } |
| 39 #endif /* LDAP_THREAD_HAVE_TPOOL */ | 39 #endif /* LDAP_THREAD_HAVE_TPOOL */ |
| 40 Index: libraries/libmdb/mdb.c | |
| 41 --- libraries/libmdb/mdb.c.orig 2011-11-25 19:52:29.000000000 +0100 | |
| 42 +++ libraries/libmdb/mdb.c 2011-12-11 14:01:59.000000000 +0100 | |
| 43 @@ -213,7 +213,11 @@ | |
| 44 * Otherwise compile with the less efficient -DMDB_DSYNC=O_SYNC. | |
| 45 */ | |
| 46 #ifndef MDB_DSYNC | |
| 47 -# define MDB_DSYNC O_DSYNC | |
| 48 +# ifdef O_DSYNC | |
| 49 +# define MDB_DSYNC O_DSYNC | |
| 50 +# else | |
| 51 +# define MDB_DSYNC O_SYNC | |
| 52 +# endif | |
| 53 #endif | |
| 54 #endif | |
| 55 | |
| 40 Index: servers/slapd/back-perl/config.c | 56 Index: servers/slapd/back-perl/config.c |
| 41 --- servers/slapd/back-perl/config.c.orig 2011-01-05 00:50:41.000000000 +0100 | 57 --- servers/slapd/back-perl/config.c.orig 2011-11-25 19:52:29.000000000 +0100 |
| 42 +++ servers/slapd/back-perl/config.c 2011-02-12 10:17:43.000000000 +0100 | 58 +++ servers/slapd/back-perl/config.c 2011-12-11 14:02:56.000000000 +0100 |
| 43 @@ -49,6 +49,9 @@ | 59 @@ -173,6 +173,9 @@ |
| 44 } | 60 } else { |
| 61 switch( c->type ) { | |
| 62 case PERL_MODULE: | |
| 63 + if (c->argc > 2) | |
| 64 + snprintf( eval_str, EVAL_BUF_SIZE, "require \"%s\";", c->argv[2] ); | |
| 65 + else | |
| 66 snprintf( eval_str, EVAL_BUF_SIZE, "use %s;", c->argv[1] ); | |
| 67 eval_pv( eval_str, 0 ); | |
| 45 | 68 |
| 46 #ifdef PERL_IS_5_6 | |
| 47 + if (argc > 2) | |
| 48 + snprintf( eval_str, EVAL_BUF_SIZE, "require \"%s\";", argv[2] ); | |
| 49 + else | |
| 50 snprintf( eval_str, EVAL_BUF_SIZE, "use %s;", argv[1] ); | |
| 51 eval_pv( eval_str, 0 ); | |
| 52 |
