* [gentoo-commits] gentoo-x86 commit in dev-db/mongodb/files: mongodb-2.4-fix-sasl.patch
@ 2015-02-23 14:37 Alexys Jacob (ultrabug)
0 siblings, 0 replies; only message in thread
From: Alexys Jacob (ultrabug) @ 2015-02-23 14:37 UTC (permalink / raw
To: gentoo-commits
ultrabug 15/02/23 14:37:49
Added: mongodb-2.4-fix-sasl.patch
Log:
fix #501744
(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key B658FA13)
Revision Changes Path
1.1 dev-db/mongodb/files/mongodb-2.4-fix-sasl.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/mongodb/files/mongodb-2.4-fix-sasl.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/mongodb/files/mongodb-2.4-fix-sasl.patch?rev=1.1&content-type=text/plain
Index: mongodb-2.4-fix-sasl.patch
===================================================================
--- a/src/mongo/client/sasl_client_session.cpp 2014-10-15 00:40:29.000000000 +0400
+++ b/src/mongo/client/sasl_client_session.cpp 2015-02-07 18:56:02.287762467 +0300
@@ -29,17 +29,26 @@
* doesn't initialize the library for us.
*/
- void* saslOurMalloc(unsigned long sz) {
+// Version 2.1.26 is the first version to use size_t in the allocator signatures
+#if (SASL_VERSION_FULL >= ((2 << 16) | (1 << 8) | 26))
+ typedef size_t SaslAllocSize;
+#else
+ typedef unsigned long SaslAllocSize;
+#endif
+
+ typedef int(*SaslCallbackFn)();
+
+ void* saslOurMalloc(SaslAllocSize sz) {
return ourmalloc(sz);
}
- void* saslOurCalloc(unsigned long count, unsigned long size) {
+ void* saslOurCalloc(SaslAllocSize count, SaslAllocSize size) {
void* ptr = calloc(count, size);
- if (!ptr) printStackAndExit(0);
+ if (!ptr) abort();
return ptr;
}
- void* saslOurRealloc(void* ptr, unsigned long sz) {
+ void* saslOurRealloc(void* ptr, SaslAllocSize sz) {
return ourrealloc(ptr, sz);
}
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2015-02-23 14:37 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-02-23 14:37 [gentoo-commits] gentoo-x86 commit in dev-db/mongodb/files: mongodb-2.4-fix-sasl.patch Alexys Jacob (ultrabug)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox