[devel] [PATCH 1 of 1] imm: guard osafimmpbed by parent pid instead of parent name [#1496]

[Zoran Milinkovic]

 osaf/services/saf/immsv/immpbed/immpbe.cc |  14 ++++++++------
 1 files changed, 8 insertions(+), 6 deletions(-)


The patch change the parent check from parent process name to parent pid.
This patch will allow to start osafimmnd with debugging tools (valgrind, etc.) 
when PBE is enabled.

diff --git a/osaf/services/saf/immsv/immpbed/immpbe.cc 
b/osaf/services/saf/immsv/immpbed/immpbe.cc
--- a/osaf/services/saf/immsv/immpbed/immpbe.cc
+++ b/osaf/services/saf/immsv/immpbed/immpbe.cc
@@ -27,6 +27,7 @@
 #include <assert.h>
 #include <libgen.h>
 #include <unistd.h>
+#include "configmake.h"
 
 #define XML_VERSION "1.0"
 
@@ -51,26 +52,27 @@ static const SaImmCallbacksT callbacks =
  * Check if osafimmpbe is executed by osafimmnd
  */
 static void checkParentProcess() {
-       char cmd[1024];
-       char *base;
+       const char *cmd = "cat " PKGPIDDIR "/osafimmnd.pid";
+       char buf[100];
        pid_t ppid = getppid();
+       pid_t immndpid;
 
-       sprintf(cmd, "cat /proc/%u/cmdline", ppid);
        FILE *f = popen(cmd, "r");
        if(!f)
                goto fail;
 
-       if(!fgets(cmd, 1024, f)) {
+       if(!fgets(buf, 100, f)) {
                pclose(f);
                goto fail;
        }
 
        pclose(f);
 
-       base = basename(cmd);
+       immndpid = strtol(buf, NULL, 10);
 
-       if(strncmp(base, "osafimmnd", strlen("osafimmnd")))
+       if(immndpid != ppid) {
                goto fail;
+       }
 
        return;
 

------------------------------------------------------------------------------
_______________________________________________
Opensaf-devel mailing list
Opensaf-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/opensaf-devel