gdm-format.patch

   1 --- gdm-2.20.11/daemon/gdm-daemon-config.c.orig 2010-06-03 03:06:25.000000000 +0200
   2 +++ gdm-2.20.11/daemon/gdm-daemon-config.c      2018-04-22 21:53:51.242329643 +0200
   3 @@ -1935,7 +1935,7 @@
   4
   5         } else {
   6                 if (console_notify) {
   7 -                       gchar *s = g_strdup_printf (C_(N_("XDMCP is disabled and GDM "
   8 +                       gchar *s = g_strdup (C_(N_("XDMCP is disabled and GDM "
   9                                                           "cannot find any static server "
  10                                                           "to start.  Aborting!  Please "
  11                                                           "correct the configuration "
  12 @@ -1993,7 +1993,7 @@
  13
  14         if G_UNLIKELY (uid == 0) {
  15                 if (console_notify) {
  16 -                       gchar *s = g_strdup_printf (C_(N_("The GDM user is set to be root, but "
  17 +                       gchar *s = g_strdup (C_(N_("The GDM user is set to be root, but "
  18                                                           "this is not allowed since it can "
  19                                                           "pose a security risk.  Please "
  20                                                           "correct GDM configuration and "
  21 @@ -2025,7 +2025,7 @@
  22
  23         if G_UNLIKELY (gid == 0) {
  24                 if (console_notify) {
  25 -                       gchar *s = g_strdup_printf (C_(N_("The GDM group is set to be root, but "
  26 +                       gchar *s = g_strdup (C_(N_("The GDM group is set to be root, but "
  27                                                           "this is not allowed since it can "
  28                                                           "pose a security risk. Please "
  29                                                           "correct GDM configuration and "
  30 --- gdm-2.20.11/daemon/slave.c.orig     2010-06-03 03:06:25.000000000 +0200
  31 +++ gdm-2.20.11/daemon/slave.c  2018-04-22 22:15:02.428981793 +0200
  32 @@ -265,7 +265,7 @@
  33         } else {                                                                        \
  34                 /* evil! how this this happen */                                        \
  35                 if (slave_start_jmp_error_to_print != NULL)                             \
  36 -                       gdm_error (slave_start_jmp_error_to_print);                     \
  37 +                       gdm_error ("%s", slave_start_jmp_error_to_print);               \
  38                 gdm_error ("Bad (very very VERY bad!) things happening in signal");     \
  39                 _exit (DISPLAY_REMANAGE);                                               \
  40         }                                                                               \
  41 @@ -691,7 +691,7 @@
  42         need_to_quit_after_session_stop = TRUE;
  43
  44         if (slave_start_jmp_error_to_print != NULL)
  45 -               gdm_error (slave_start_jmp_error_to_print);
  46 +               gdm_error ("%s", slave_start_jmp_error_to_print);
  47         slave_start_jmp_error_to_print = NULL;
  48
  49         /* only if we're not hanging in session stop and getting a
  50 @@ -720,7 +720,7 @@
  51         need_to_quit_after_session_stop = TRUE;
  52
  53         if (slave_start_jmp_error_to_print != NULL)
  54 -               gdm_error (slave_start_jmp_error_to_print);
  55 +               gdm_error ("%s", slave_start_jmp_error_to_print);
  56         slave_start_jmp_error_to_print = NULL;
  57
  58         gdm_debug ("term_quit: Final cleanup");
  59 --- gdm-2.20.11/daemon/misc.c.orig      2010-06-03 03:06:25.000000000 +0200
  60 +++ gdm-2.20.11/daemon/misc.c   2018-04-22 22:15:49.818981253 +0200
  61 @@ -2222,7 +2222,7 @@
  62      va_end (args);
  63
  64      /* Log to both syslog and stderr */
  65 -    gdm_error (s);
  66 +    gdm_error ("%s", s);
  67      if (getpid () == gdm_main_pid) {
  68             gdm_fdprintf (2, "%s\n", s);
  69      }