|
 |
1e501a |
From 461f55218867e7e8e25ab85dc93faf8193cbe243 Mon Sep 17 00:00:00 2001
|
|
|
1e501a |
From: Ray Strode <rstrode@redhat.com>
|
|
|
1e501a |
Date: Fri, 3 Jul 2015 14:39:33 -0400
|
|
|
1e501a |
Subject: [PATCH] server: add -audit 4 to default flags
|
|
|
1e501a |
|
|
|
1e501a |
---
|
|
|
1e501a |
daemon/gdm-server.c | 2 +-
|
|
|
1e501a |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
1e501a |
|
|
|
1e501a |
diff --git a/daemon/gdm-server.c b/daemon/gdm-server.c
|
|
|
1e501a |
index ccb26a3..b52465e 100644
|
|
|
1e501a |
--- a/daemon/gdm-server.c
|
|
|
1e501a |
+++ b/daemon/gdm-server.c
|
|
|
1e501a |
@@ -249,61 +249,61 @@ gdm_server_launch_sigusr1_thread_if_needed (void)
|
|
|
1e501a |
static GThread *sigusr1_thread;
|
|
|
1e501a |
|
|
|
1e501a |
if (sigusr1_thread == NULL) {
|
|
|
1e501a |
sigusr1_thread = g_thread_new ("gdm SIGUSR1 catcher", sigusr1_thread_main, NULL);
|
|
|
1e501a |
|
|
|
1e501a |
g_mutex_lock (&sigusr1_thread_mutex);
|
|
|
1e501a |
while (!sigusr1_thread_running)
|
|
|
1e501a |
g_cond_wait (&sigusr1_thread_cond, &sigusr1_thread_mutex);
|
|
|
1e501a |
g_mutex_unlock (&sigusr1_thread_mutex);
|
|
|
1e501a |
}
|
|
|
1e501a |
}
|
|
|
1e501a |
|
|
|
1e501a |
static void
|
|
|
1e501a |
gdm_server_init_command (GdmServer *server)
|
|
|
1e501a |
{
|
|
|
1e501a |
gboolean debug = FALSE;
|
|
|
1e501a |
const char *debug_options;
|
|
|
1e501a |
const char *verbosity = "";
|
|
|
1e501a |
|
|
|
1e501a |
if (server->priv->command != NULL) {
|
|
|
1e501a |
return;
|
|
|
1e501a |
}
|
|
|
1e501a |
|
|
|
1e501a |
gdm_settings_direct_get_boolean (GDM_KEY_DEBUG, &debug);
|
|
|
1e501a |
if (debug) {
|
|
|
1e501a |
debug_options = " -logverbose 7 -core ";
|
|
|
1e501a |
} else {
|
|
|
1e501a |
debug_options = "";
|
|
|
1e501a |
}
|
|
|
1e501a |
|
|
|
1e501a |
-#define X_SERVER_ARG_FORMAT " -background none -noreset -verbose %s%s"
|
|
|
1e501a |
+#define X_SERVER_ARG_FORMAT " -background none -noreset -audit 4 -verbose %s%s"
|
|
|
1e501a |
|
|
|
1e501a |
#ifdef WITH_SYSTEMD
|
|
|
1e501a |
|
|
|
1e501a |
/* This is a temporary hack to work around the fact that XOrg
|
|
|
1e501a |
* currently lacks support for multi-seat hotplugging for
|
|
|
1e501a |
* display devices. This bit should be removed as soon as XOrg
|
|
|
1e501a |
* gains native support for automatically enumerating usb
|
|
|
1e501a |
* based graphics adapters at start-up via udev. */
|
|
|
1e501a |
|
|
|
1e501a |
/* systemd ships an X server wrapper tool which simply invokes
|
|
|
1e501a |
* the usual X but ensures it only uses the display devices of
|
|
|
1e501a |
* the seat. */
|
|
|
1e501a |
|
|
|
1e501a |
/* We do not rely on this wrapper server if, a) the machine
|
|
|
1e501a |
* wasn't booted using systemd, or b) the wrapper tool is
|
|
|
1e501a |
* missing, or c) we are running for the main seat 'seat0'. */
|
|
|
1e501a |
|
|
|
1e501a |
if (!LOGIND_RUNNING()) {
|
|
|
1e501a |
goto fallback;
|
|
|
1e501a |
}
|
|
|
1e501a |
|
|
|
1e501a |
#ifdef ENABLE_SYSTEMD_JOURNAL
|
|
|
1e501a |
/* For systemd, we don't have a log file but instead log to stdout,
|
|
|
1e501a |
so set it to the xserver's built-in default verbosity */
|
|
|
1e501a |
if (debug)
|
|
|
1e501a |
verbosity = "7 -logfile /dev/null";
|
|
|
1e501a |
else
|
|
|
1e501a |
verbosity = "3 -logfile /dev/null";
|
|
|
1e501a |
#endif
|
|
|
1e501a |
|
|
|
1e501a |
--
|
|
|
1e501a |
2.3.7
|
|
|
1e501a |
|