From 99c197025ad61a9ecd7ae3bcd02e9569415fb90a Mon Sep 17 00:00:00 2001 From: Stephen Gallagher Date: Fri, 26 Feb 2016 13:10:50 -0500 Subject: [PATCH 084/108] GPO: Add Cockpit to the Remote Interactive defaults MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The Cockpit Project is an administrative console that is gaining in popularity and is a default component on some operating systems (such as Fedora Server). Since it is becoming more common, we should ensure that it is part of the standard mapping. Reviewed-by: Lukáš Slebodník (cherry picked from commit 0e799bc491f636c69657d1678af13d23bf7b7c10) (cherry picked from commit 71e700368aa88a0adb14047b7fd8c97ff9487c28) --- src/man/sssd-ad.5.xml | 5 +++++ src/providers/ad/ad_gpo.c | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/man/sssd-ad.5.xml b/src/man/sssd-ad.5.xml index 4280eac5f4594b26d158a0ea58622f9fe7beb53e..b042480dff164e3626f61c520e51bb756bcbfd9c 100644 --- a/src/man/sssd-ad.5.xml +++ b/src/man/sssd-ad.5.xml @@ -463,6 +463,11 @@ ad_gpo_map_remote_interactive = +my_pam_service, -sshd sshd + + + cockpit + + diff --git a/src/providers/ad/ad_gpo.c b/src/providers/ad/ad_gpo.c index 00f4457ddfa35b8917d7babc6666fdc129fb63ae..69c462f04d60888f11bbf5359d0dda821339bb81 100644 --- a/src/providers/ad/ad_gpo.c +++ b/src/providers/ad/ad_gpo.c @@ -191,6 +191,7 @@ int ad_gpo_process_cse_recv(struct tevent_req *req); #define GPO_SUDO "sudo" #define GPO_SUDO_I "sudo-i" #define GPO_SYSTEMD_USER "systemd-user" +#define GPO_COCKPIT "cockpit" struct gpo_map_option_entry { enum gpo_map_type gpo_map_type; @@ -203,7 +204,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}; -const char *gpo_map_remote_interactive_defaults[] = {GPO_SSHD, NULL}; +const char *gpo_map_remote_interactive_defaults[] = {GPO_SSHD, GPO_COCKPIT, + NULL}; const char *gpo_map_network_defaults[] = {GPO_FTP, GPO_SAMBA, NULL}; const char *gpo_map_batch_defaults[] = {GPO_CROND, NULL}; const char *gpo_map_service_defaults[] = {NULL}; -- 2.7.3