comparison: openldap/openldap.patch
openldap/openldap.patch
- changeset 777
- 4e2fe5febd48
- parent 587
- d0df67c21897
equal
deleted
inserted
replaced
| 3:7a30fb1b5029 | 4:2be14f4c1b41 |
|---|---|
| 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-11-25 19:52:29.000000000 +0100 | 30 --- libraries/libldap_r/tpool.c.orig 2011-11-25 19:52:29.000000000 +0100 |
| 31 +++ libraries/libldap_r/tpool.c 2011-12-11 14:01:59.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 | 40 Index: libraries/libmdb/mdb.c |
| 41 --- libraries/libmdb/mdb.c.orig 2011-11-25 19:52:29.000000000 +0100 | 41 --- libraries/liblmdb/mdb.c.orig 2011-11-25 19:52:29.000000000 +0100 |
| 42 +++ libraries/libmdb/mdb.c 2011-12-11 14:01:59.000000000 +0100 | 42 +++ libraries/liblmdb/mdb.c 2011-12-11 14:01:59.000000000 +0100 |
| 43 @@ -198,7 +198,11 @@ | 43 @@ -236,7 +236,11 @@ |
| 44 * Otherwise compile with the less efficient -DMDB_DSYNC=O_SYNC. | 44 * Otherwise compile with the less efficient -DMDB_DSYNC=O_SYNC. |
| 45 */ | 45 */ |
| 46 #ifndef MDB_DSYNC | 46 #ifndef MDB_DSYNC |
| 47 -# define MDB_DSYNC O_DSYNC | 47 -# define MDB_DSYNC O_DSYNC |
| 48 +# ifdef O_DSYNC | 48 +# ifdef O_DSYNC |
