- Use correct identifier for SHM destroy.

git-svn-id: file:///svn/unbound/trunk@4103 be551aaa-1e26-0410-a405-d3ace91eadb9

diff --git a/doc/Changelog b/doc/Changelog
index eb30d8d34aeea9fe02d0022a679d88627b2d18b7..1bc6fafce0e564bed85266bbfca8a1758cffd297 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -3,6 +3,7 @@
        - Fix small memory leak in edns_opt_copy_alloc.
        - Respip dereference after NULL check.
        - Zero initialize addrtree allocation.
+       - Use correct identifier for SHM destroy.
 
 7 April 2017: George
        - Fix pythonmod for cb changes.

diff --git a/util/shm_side/shm_main.c b/util/shm_side/shm_main.c
index 2911db7904ed0382f2b6c117601adf1149a0ba82..1753b15e22a8944f5b790bacc4dce2fdab051a56 100644 (file)
--- a/util/shm_side/shm_main.c
+++ b/util/shm_side/shm_main.c
@@ -118,7 +118,7 @@ int shm_main_init(struct daemon* daemon)
 
        /* Destroy previous SHM */
        if (daemon->shm_info->id_arr >= 0)
-               shmctl(daemon->shm_info->id_ctl, IPC_RMID, NULL);
+               shmctl(daemon->shm_info->id_arr, IPC_RMID, NULL);
 
        /* SHM: Create the segment */
        daemon->shm_info->id_ctl = shmget(daemon->shm_info->key, sizeof(struct shm_stat_info), IPC_CREAT | 0666);