diff options
| author | Brian Cameron <brian.cameron@sun.com> | 2006-08-07 19:49:29 +0000 |
|---|---|---|
| committer | Brian Cameron <bcameron@src.gnome.org> | 2006-08-07 19:49:29 +0000 |
| commit | 5b06ddbd48d4d1b6285bfad30da86e33b54c0893 (patch) | |
| tree | cbe8c6142347696974b7c1795bb21b1ed641d0e7 | |
| parent | 36182b00348a37b9f96172de6495b4b702c5040f (diff) | |
| download | gdm-5b06ddbd48d4d1b6285bfad30da86e33b54c0893.tar.gz | |
Remove calls to syslog/malloc that are called from inside signal handlers,
2006-08-03 Brian Cameron <brian.cameron@sun.com>
* daemon/slave.c: Remove calls to syslog/malloc that are called
from inside signal handlers, since they are not safe. Patch
provided by Ray Strode <rstrode@redhat.com>.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | daemon/slave.c | 8 |
2 files changed, 6 insertions, 8 deletions
@@ -1,3 +1,9 @@ +2006-08-03 Brian Cameron <brian.cameron@sun.com> + + * daemon/slave.c: Remove calls to syslog/malloc that are called + from inside signal handlers, since they are not safe. Patch + provided by Ray Strode <rstrode@redhat.com>. + 2006-08-03 Ray Strode <rstrode@redhat.com> * configure.ac: look for /usr/bin/Xorg when searching for diff --git a/daemon/slave.c b/daemon/slave.c index 2c65d73d..7132170f 100644 --- a/daemon/slave.c +++ b/daemon/slave.c @@ -4534,8 +4534,6 @@ gdm_slave_term_handler (int sig) gdm_in_signal++; gdm_wait_for_ack = FALSE; - gdm_debug ("gdm_slave_term_handler: %s got TERM/INT signal", d->name); - exit_code_to_use = DISPLAY_ABORT; need_to_quit_after_session_stop = TRUE; @@ -4589,9 +4587,6 @@ gdm_slave_alrm_handler (int sig) gdm_in_signal++; - gdm_debug ("gdm_slave_alrm_handler: %s got ARLM signal, " - "to ping display", d->name); - if G_UNLIKELY (d->dsp == NULL) { gdm_in_signal --; /* huh? */ @@ -4599,9 +4594,6 @@ gdm_slave_alrm_handler (int sig) } if G_UNLIKELY (in_ping) { - slave_start_jmp_error_to_print = - g_strdup_printf (_("Ping to %s failed; whacking display!"), - d->name); need_to_quit_after_session_stop = TRUE; exit_code_to_use = DISPLAY_REMANAGE; |