ldap/servers/slapd/snmp_collator.c | 6 +++---
ldap/servers/slapd/util.c | 3 +--
2 files changed, 4 insertions(+), 5 deletions(-)
New commits:
commit d53ad9aa3b4bdcca19ebf7eed4fe0ecae008d884
Author: William Brown <firstyear(a)redhat.com>
Date: Mon Oct 17 14:47:24 2016 +1000
Ticket 48538 - Failed to delete old semaphore
Bug Description: The error would show:
Failed to delete /opt/dirsrv/var/run/dirsrv/slapd-localhost.stats
But really we were trying to delete /dev/shm/slapd-localhost.stats
Fix Description: Update the error message to use the correct file path.
https://fedorahosted.org/389/ticket/48538
Author: wibrown
Review by: nhosoi (Thanks!)
diff --git a/ldap/servers/slapd/snmp_collator.c b/ldap/servers/slapd/snmp_collator.c
index e7ffdb4..841922f 100644
--- a/ldap/servers/slapd/snmp_collator.c
+++ b/ldap/servers/slapd/snmp_collator.c
@@ -459,7 +459,7 @@ snmp_collator_create_semaphore(void)
if (sem_unlink(stats_sem_name) != 0) {
slapi_log_err(SLAPI_LOG_EMERG,
"snmp_collator_create_semaphore",
"Failed to delete old semaphore for stats file (%s). "
- "Error %d (%s).\n", szStatsFile, errno,
slapd_system_strerror(errno) );
+ "Error %d (%s).\n", stats_sem_name, errno,
slapd_system_strerror(errno) );
exit(1);
}
@@ -467,14 +467,14 @@ snmp_collator_create_semaphore(void)
/* No dice */
slapi_log_err(SLAPI_LOG_EMERG,
"snmp_collator_create_semaphore",
"Failed to create semaphore for stats file (%s). Error %d
(%s).\n",
- szStatsFile, errno, slapd_system_strerror(errno) );
+ stats_sem_name, errno, slapd_system_strerror(errno) );
exit(1);
}
} else {
/* Some other problem occurred creating the semaphore. */
slapi_log_err(SLAPI_LOG_EMERG, "snmp_collator_create_semaphore",
"Failed to create semaphore for stats file (%s). Error
%d.(%s)\n",
- szStatsFile, errno, slapd_system_strerror(errno) );
+ stats_sem_name, errno, slapd_system_strerror(errno) );
exit(1);
}
}
commit 70708260afe6c04be92b1d761eb75da55f7d5d0f
Author: William Brown <firstyear(a)redhat.com>
Date: Mon Oct 17 14:46:27 2016 +1000
Ticket 48978 - Build fails on i686
Bug Description: Build fails on i686
Fix Description: Fix a message that had an unterminated ).
https://fedorahosted.org/389/ticket/48978
Author: wibrown
Review by: One line fix
diff --git a/ldap/servers/slapd/util.c b/ldap/servers/slapd/util.c
index 7fef95d..9a8f61d 100644
--- a/ldap/servers/slapd/util.c
+++ b/ldap/servers/slapd/util.c
@@ -1735,8 +1735,7 @@ int util_info_sys_pages(size_t *pagesize, size_t *pages, size_t
*procpages, size
size_t one_gig_pages = GIGABYTE / *pagesize;
if (*pages > (2 * one_gig_pages) ) {
slapi_log_err(SLAPI_LOG_TRACE,"util_info_sys_pages",
- "More than 2Gbytes physical memory detected. Since this is a
32-bit process, "
- "truncating memory size used for auto cache calculations to
2Gbytes\n";
+ "More than 2Gbytes physical memory detected. Since this is a
32-bit process, truncating memory size used for auto cache calculations to
2Gbytes\n");
*pages = (2 * one_gig_pages);
}
}