diff options
| author | Robert Ancell <robert.ancell@canonical.com> | 2017-09-28 15:33:50 -0400 |
|---|---|---|
| committer | Ray Strode <rstrode@redhat.com> | 2017-10-03 16:18:28 -0400 |
| commit | 69420ae2c587c75cfb915330d4f60f866281345b (patch) | |
| tree | c3db9bef9e74a801c0f42e31d0a1b8ab6b78800c /daemon/gdm-server.c | |
| parent | e6f5fa6d95e2661477471c6ff1a6a0c379421785 (diff) | |
| download | gdm-69420ae2c587c75cfb915330d4f60f866281345b.tar.gz | |
Use standard exit codes.
Use EXIT_ defines for readibility.
There were some exit codes > 1, but they don't seem to be checked by any of the
parent process code. This does mean that the logs might have changed, but
modern logging techniques have probably made this obsolete.
https://bugzilla.gnome.org/show_bug.cgi?id=788307
Diffstat (limited to 'daemon/gdm-server.c')
| -rw-r--r-- | daemon/gdm-server.c | 22 |
1 files changed, 7 insertions, 15 deletions
diff --git a/daemon/gdm-server.c b/daemon/gdm-server.c index 79cddc6e..83fba99c 100644 --- a/daemon/gdm-server.c +++ b/daemon/gdm-server.c @@ -65,14 +65,6 @@ extern char **environ; #define GDM_SERVER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GDM_TYPE_SERVER, GdmServerPrivate)) -/* These are the servstat values, also used as server - * process exit codes */ -#define SERVER_TIMEOUT 2 /* Server didn't start */ -#define SERVER_DEAD 250 /* Server stopped */ -#define SERVER_PENDING 251 /* Server started but not ready for connections yet */ -#define SERVER_RUNNING 252 /* Server running and ready for connections */ -#define SERVER_ABORT 253 /* Server failed badly. Suspending display. */ - #define MAX_LOGS 5 struct GdmServerPrivate @@ -390,7 +382,7 @@ change_user (GdmServer *server) if (pwent == NULL) { g_warning (_("Server was to be spawned by user %s but that user doesn’t exist"), server->priv->user_name); - _exit (1); + _exit (EXIT_FAILURE); } g_debug ("GdmServer: Changing (uid:gid) for child process to (%d:%d)", @@ -401,19 +393,19 @@ change_user (GdmServer *server) if (setgid (pwent->pw_gid) < 0) { g_warning (_("Couldn’t set groupid to %d"), pwent->pw_gid); - _exit (1); + _exit (EXIT_FAILURE); } if (initgroups (pwent->pw_name, pwent->pw_gid) < 0) { g_warning (_("initgroups () failed for %s"), pwent->pw_name); - _exit (1); + _exit (EXIT_FAILURE); } if (setuid (pwent->pw_uid) < 0) { g_warning (_("Couldn’t set userid to %d"), (int)pwent->pw_uid); - _exit (1); + _exit (EXIT_FAILURE); } } else { gid_t groups[1] = { 0 }; @@ -512,19 +504,19 @@ server_child_setup (GdmServer *server) if (sigaction (SIGUSR1, &ign_signal, NULL) < 0) { g_warning (_("%s: Error setting %s to %s"), "gdm_server_spawn", "USR1", "SIG_IGN"); - _exit (SERVER_ABORT); + _exit (EXIT_FAILURE); } if (sigaction (SIGTTIN, &ign_signal, NULL) < 0) { g_warning (_("%s: Error setting %s to %s"), "gdm_server_spawn", "TTIN", "SIG_IGN"); - _exit (SERVER_ABORT); + _exit (EXIT_FAILURE); } if (sigaction (SIGTTOU, &ign_signal, NULL) < 0) { g_warning (_("%s: Error setting %s to %s"), "gdm_server_spawn", "TTOU", "SIG_IGN"); - _exit (SERVER_ABORT); + _exit (EXIT_FAILURE); } /* And HUP and TERM are at SIG_DFL from gdm_unset_signals, |