74ca47
From bbc63ef4dab6c275b1d8b8fe6439483309781401 Mon Sep 17 00:00:00 2001
74ca47
From: William Brown <firstyear@redhat.com>
74ca47
Date: Fri, 12 May 2017 10:09:32 +1000
74ca47
Subject: [PATCH] Ticket 48538 - Failed to delete old semaphore
74ca47
74ca47
Bug Description:  I misunderstood the sem_unlink call, and logged
74ca47
the wrong filepath.
74ca47
74ca47
Fix Description:  Fix the file path of the semaphore.
74ca47
74ca47
https://pagure.io/389-ds-base/issue/48538
74ca47
74ca47
Author: wibrown
74ca47
74ca47
Review by: mreynolds (Thanks!)
74ca47
74ca47
(cherry picked from commit b81c8ba38c29e15e13b0dd0bf6f5d3c773d31b20)
74ca47
---
74ca47
 ldap/servers/slapd/snmp_collator.c | 12 ++++++------
74ca47
 1 file changed, 6 insertions(+), 6 deletions(-)
74ca47
74ca47
diff --git a/ldap/servers/slapd/snmp_collator.c b/ldap/servers/slapd/snmp_collator.c
74ca47
index 21043d9..2deab91 100644
74ca47
--- a/ldap/servers/slapd/snmp_collator.c
74ca47
+++ b/ldap/servers/slapd/snmp_collator.c
74ca47
@@ -458,23 +458,23 @@ snmp_collator_create_semaphore(void)
74ca47
              * around.  Recreate it since we don't know what state it is in. */
74ca47
             if (sem_unlink(stats_sem_name) != 0) {
74ca47
                 slapi_log_err(SLAPI_LOG_EMERG, "snmp_collator_create_semaphore",
74ca47
-                        "Failed to delete old semaphore for stats file (%s). "
74ca47
-                        "Error %d (%s).\n", stats_sem_name, errno, slapd_system_strerror(errno) );
74ca47
+                        "Failed to delete old semaphore for stats file (/dev/shm/sem.%s). "
74ca47
+                        "Error %d (%s).\n", stats_sem_name + 1, errno, slapd_system_strerror(errno) );
74ca47
                 exit(1);
74ca47
             }
74ca47
 
74ca47
             if ((stats_sem = sem_open(stats_sem_name, O_CREAT | O_EXCL, SLAPD_DEFAULT_FILE_MODE, 1)) == SEM_FAILED) {
74ca47
                 /* No dice */
74ca47
                 slapi_log_err(SLAPI_LOG_EMERG, "snmp_collator_create_semaphore",
74ca47
-                        "Failed to create semaphore for stats file (%s). Error %d (%s).\n",
74ca47
-                        stats_sem_name, errno, slapd_system_strerror(errno) );
74ca47
+                        "Failed to create semaphore for stats file (/dev/shm/sem.%s). Error %d (%s).\n",
74ca47
+                        stats_sem_name + 1, errno, slapd_system_strerror(errno) );
74ca47
                 exit(1);
74ca47
             }
74ca47
         } else {
74ca47
             /* Some other problem occurred creating the semaphore. */
74ca47
             slapi_log_err(SLAPI_LOG_EMERG, "snmp_collator_create_semaphore",
74ca47
-                    "Failed to create semaphore for stats file (%s). Error %d.(%s)\n",
74ca47
-                    stats_sem_name, errno, slapd_system_strerror(errno) );
74ca47
+                    "Failed to create semaphore for stats file (/dev/shm/sem.%s). Error %d.(%s)\n",
74ca47
+                    stats_sem_name + 1, errno, slapd_system_strerror(errno) );
74ca47
             exit(1);
74ca47
         }
74ca47
     }
74ca47
-- 
74ca47
2.9.4
74ca47