VERSION.sh | 2 +-
ldap/servers/slapd/ch_malloc.c | 5 +----
2 files changed, 2 insertions(+), 5 deletions(-)
New commits:
commit 136b366da0646546d8304aa001a18242d7ff578a
Author: Mark Reynolds <mreynolds(a)redhat.com>
Date: Thu Nov 3 15:39:29 2016 -0400
Bump version to 1.3.5.15
diff --git a/VERSION.sh b/VERSION.sh
index 9f5604a..7c3ee62 100644
--- a/VERSION.sh
+++ b/VERSION.sh
@@ -10,7 +10,7 @@ vendor="389 Project"
# PACKAGE_VERSION is constructed from these
VERSION_MAJOR=1
VERSION_MINOR=3
-VERSION_MAINT=5.14
+VERSION_MAINT=5.15
# NOTE: VERSION_PREREL is automatically set for builds made out of a git tree
VERSION_PREREL=
VERSION_DATE=$(date -u +%Y%m%d)
diff --git a/ldap/servers/slapd/ch_malloc.c b/ldap/servers/slapd/ch_malloc.c
index 515e746..c8eefa2 100644
--- a/ldap/servers/slapd/ch_malloc.c
+++ b/ldap/servers/slapd/ch_malloc.c
@@ -129,9 +129,6 @@ slapi_ch_malloc(
PR_INCREMENT_COUNTER(slapi_ch_counter_created);
PR_INCREMENT_COUNTER(slapi_ch_counter_exist);
- /* So long as this happens once, we are happy, put it in ch_malloc. */
- create_oom_buffer();
-
return( newmem );
}
@@ -150,7 +147,7 @@ slapi_ch_memalign(size_t size, size_t alignment)
int oserr = errno;
oom_occurred();
- slapi_log_err(SLAPI_LOG_ERR, SLAPD_MODULE,
+ slapi_log_error(SLAPI_LOG_FATAL, SLAPD_MODULE,
"malloc of %lu bytes failed; OS error %d (%s)%s\n",
size, oserr, slapd_system_strerror( oserr ), oom_advice );
exit( 1 );
Show replies by date