80 lines
3.3 KiB
Diff
80 lines
3.3 KiB
Diff
From 665fae391bbb6c5173ec0086247f20d95a0c9026 Mon Sep 17 00:00:00 2001
|
|
From: Stephen Gallagher <sgallagh@redhat.com>
|
|
Date: Fri, 26 Feb 2016 13:21:23 -0500
|
|
Subject: [PATCH 085/108] GPO: Add other display managers to interactive logon
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Gone are the days when all systems used GDM or KDM. We need to support
|
|
other display managers in the default configuration to avoid issues
|
|
when enrolled in AD domains.
|
|
|
|
Reviewed-by: Lukáš Slebodník <lslebodn@redhat.com>
|
|
(cherry picked from commit 293cf52a00c9c67f0ad8f264027f81c020854f66)
|
|
(cherry picked from commit 26d4fe97a93b15da60eba98c5c26fde13efd950a)
|
|
---
|
|
src/man/sssd-ad.5.xml | 20 ++++++++++++++++++++
|
|
src/providers/ad/ad_gpo.c | 7 ++++++-
|
|
2 files changed, 26 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/src/man/sssd-ad.5.xml b/src/man/sssd-ad.5.xml
|
|
index b042480dff164e3626f61c520e51bb756bcbfd9c..54a4b56271933bae5d0f86e24b39ddd3fbee7a37 100644
|
|
--- a/src/man/sssd-ad.5.xml
|
|
+++ b/src/man/sssd-ad.5.xml
|
|
@@ -422,6 +422,26 @@ ad_gpo_map_interactive = +my_pam_service, -login
|
|
kdm
|
|
</para>
|
|
</listitem>
|
|
+ <listitem>
|
|
+ <para>
|
|
+ lightdm
|
|
+ </para>
|
|
+ </listitem>
|
|
+ <listitem>
|
|
+ <para>
|
|
+ lxdm
|
|
+ </para>
|
|
+ </listitem>
|
|
+ <listitem>
|
|
+ <para>
|
|
+ sddm
|
|
+ </para>
|
|
+ </listitem>
|
|
+ <listitem>
|
|
+ <para>
|
|
+ xdm
|
|
+ </para>
|
|
+ </listitem>
|
|
</itemizedlist>
|
|
</para>
|
|
</listitem>
|
|
diff --git a/src/providers/ad/ad_gpo.c b/src/providers/ad/ad_gpo.c
|
|
index 69c462f04d60888f11bbf5359d0dda821339bb81..a6ab1758d104a315ebf5e985f0ef32b58033c21c 100644
|
|
--- a/src/providers/ad/ad_gpo.c
|
|
+++ b/src/providers/ad/ad_gpo.c
|
|
@@ -184,6 +184,10 @@ int ad_gpo_process_cse_recv(struct tevent_req *req);
|
|
#define GPO_GDM_PASSWORD "gdm-password"
|
|
#define GPO_GDM_SMARTCARD "gdm-smartcard"
|
|
#define GPO_KDM "kdm"
|
|
+#define GPO_LIGHTDM "lightdm"
|
|
+#define GPO_LXDM "lxdm"
|
|
+#define GPO_SDDM "sddm"
|
|
+#define GPO_XDM "xdm"
|
|
#define GPO_SSHD "sshd"
|
|
#define GPO_FTP "ftp"
|
|
#define GPO_SAMBA "samba"
|
|
@@ -203,7 +207,8 @@ struct gpo_map_option_entry {
|
|
|
|
const char *gpo_map_interactive_defaults[] =
|
|
{GPO_LOGIN, GPO_SU, GPO_SU_L,
|
|
- GPO_GDM_FINGERPRINT, GPO_GDM_PASSWORD, GPO_GDM_SMARTCARD, GPO_KDM, NULL};
|
|
+ GPO_GDM_FINGERPRINT, GPO_GDM_PASSWORD, GPO_GDM_SMARTCARD, GPO_KDM,
|
|
+ GPO_LIGHTDM, GPO_LXDM, GPO_SDDM, GPO_XDM, NULL};
|
|
const char *gpo_map_remote_interactive_defaults[] = {GPO_SSHD, GPO_COCKPIT,
|
|
NULL};
|
|
const char *gpo_map_network_defaults[] = {GPO_FTP, GPO_SAMBA, NULL};
|
|
--
|
|
2.7.3
|
|
|