From: Jose Luis Godoy <joseluis.godoy@correo.aeat.es>
Date: Fri, 24 Jul 2015 13:24:01 +0000 (-0700)
Subject: Bug 4251: incorrect instance name for memory segments in /dev/shm
X-Git-Tag: merge-candidate-3-v1~32^2~5
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=51d4bfbb3a9e29f04d7cd14c261c5e2c352aa6e9;p=thirdparty%2Fsquid.git

Bug 4251: incorrect instance name for memory segments in /dev/shm
---

diff --git a/src/ipc/mem/Segment.cc b/src/ipc/mem/Segment.cc
index 33a6ff9c9b..524cec12c2 100644
--- a/src/ipc/mem/Segment.cc
+++ b/src/ipc/mem/Segment.cc
@@ -213,8 +213,11 @@ Ipc::Mem::Segment::GenerateName(const char *id)
         name.append(BasePath);
         if (name[name.size()-1] != '/')
             name.append('/');
-    } else
-        name.append("/squid-");
+    } else {
+        name.append('/');
+        name.append(service_name.c_str());
+        name.append('-');
+    }
 
     // append id, replacing slashes with dots
     for (const char *slash = strchr(id, '/'); slash; slash = strchr(id, '/')) {