Merge branch 'master' into journal

[elogind.git] / src / manager.c

diff --git a/src/manager.c b/src/manager.c
index 111167a8c2a19147af66dfec669a72de2b2f444a..f8cbcfcc98ff8fa7faf1f25dadf1ec7fa908e5f5 100644 (file)
--- a/src/manager.c
+++ b/src/manager.c
@@ -2032,7 +2032,7 @@ static int manager_dispatch_sigchld(Manager *m) {
                 if (si.si_code == CLD_EXITED || si.si_code == CLD_KILLED || si.si_code == CLD_DUMPED) {
                         char *name = NULL;
 
                 if (si.si_code == CLD_EXITED || si.si_code == CLD_KILLED || si.si_code == CLD_DUMPED) {
                         char *name = NULL;
 

-                        get_process_name(si.si_pid, &name);
+                        get_process_comm(si.si_pid, &name);

                         log_debug("Got SIGCHLD for process %lu (%s)", (unsigned long) si.si_pid, strna(name));
                         free(name);
                 }
                         log_debug("Got SIGCHLD for process %lu (%s)", (unsigned long) si.si_pid, strna(name));
                         free(name);
                 }


@@ -2117,7 +2117,7 @@ static int manager_process_signal_fd(Manager *m) {
                 if (sfsi.ssi_pid > 0) {
                         char *p = NULL;
 
                 if (sfsi.ssi_pid > 0) {
                         char *p = NULL;
 

-                        get_process_name(sfsi.ssi_pid, &p);
+                        get_process_comm(sfsi.ssi_pid, &p);

 
                         log_debug("Received SIG%s from PID %lu (%s).",
                                   signal_to_string(sfsi.ssi_signo),
 
                         log_debug("Received SIG%s from PID %lu (%s).",
                                   signal_to_string(sfsi.ssi_signo),