debian/patches/06_allow_libpamsystemd_and_ck_together.patch

   1 --- a/src/session.c
   2 +++ b/src/session.c
   3 @@ -781,8 +781,8 @@ session_real_run (Session *session)
   4
   5      if (login1_is_running ())
   6          session->priv->login1_session = read_string_from_child (session);
   7 -    if (!session->priv->login1_session)
   8 -        session->priv->console_kit_cookie = read_string_from_child (session);
   9 +
  10 +    session->priv->console_kit_cookie = read_string_from_child (session);
  11  }
  12
  13  void
  14 @@ -793,7 +793,7 @@ session_lock (Session *session)
  15      {
  16          if (session->priv->login1_session)
  17              login1_lock_session (session->priv->login1_session);
  18 -        else if (session->priv->console_kit_cookie)
  19 +        if (session->priv->console_kit_cookie)
  20              ck_lock_session (session->priv->console_kit_cookie);
  21      }
  22  }
  23 @@ -806,7 +806,7 @@ session_unlock (Session *session)
  24      {
  25          if (session->priv->login1_session)
  26              login1_unlock_session (session->priv->login1_session);
  27 -        else if (session->priv->console_kit_cookie)
  28 +        if (session->priv->console_kit_cookie)
  29              ck_unlock_session (session->priv->console_kit_cookie);
  30      }
  31  }
  32 --- a/src/session-child.c
  33 +++ b/src/session-child.c
  34 @@ -476,8 +476,8 @@ session_child_run (int argc, char **argv
  35          write_string (login1_session);
  36      }
  37
  38 -    if (!login1_session)
  39 -    {
  40 +
  41 +
  42          /* Open a Console Kit session */
  43          g_variant_builder_init (&ck_parameters, G_VARIANT_TYPE ("(a(sv))"));
  44          g_variant_builder_open (&ck_parameters, G_VARIANT_TYPE ("a(sv)"));
  45 @@ -506,7 +506,7 @@ session_child_run (int argc, char **argv
  46              pam_putenv (pam_handle, value);
  47              g_free (value);
  48          }
  49 -    }
  50 +
  51
  52      /* Write X authority */
  53      if (x_authority)