From 8fb5bd9096ac6373427c78660fc0e13053acd675 Mon Sep 17 00:00:00 2001
From: matt335672 <30179339+matt335672@users.noreply.github.com>
Date: Wed, 30 Aug 2023 12:37:44 +0100
Subject: [PATCH] Add keyring support for Debian and Arch

Adds optional calls to GNOME and KDE keyrings for Debian and Arch.

Also upstreams a current Debian patch to call pam_env.so
---
 instfiles/pam.d/xrdp-sesman.arch   | 15 +++++++++++----
 instfiles/pam.d/xrdp-sesman.debian | 11 ++++++++++-
 2 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/instfiles/pam.d/xrdp-sesman.arch b/instfiles/pam.d/xrdp-sesman.arch
index d303ab79e9..2763612e9c 100644
--- a/instfiles/pam.d/xrdp-sesman.arch
+++ b/instfiles/pam.d/xrdp-sesman.arch
@@ -1,5 +1,12 @@
 #%PAM-1.0
-auth        include     system-remote-login
-account     include     system-remote-login
-password    include     system-remote-login
-session     include     system-remote-login
+auth        include  system-remote-login
+-auth       optional pam_gnome_keyring.so
+-auth       optional pam_kwallet5.so
+
+account     include  system-remote-login
+
+password    include  system-remote-login
+
+session     include  system-remote-login
+-session    optional pam_gnome_keyring.so auto_start
+-session    optional pam_kwallet5.so auto_start
diff --git a/instfiles/pam.d/xrdp-sesman.debian b/instfiles/pam.d/xrdp-sesman.debian
index 789ce8f7cf..bab1e57201 100644
--- a/instfiles/pam.d/xrdp-sesman.debian
+++ b/instfiles/pam.d/xrdp-sesman.debian
@@ -1,5 +1,14 @@
 #%PAM-1.0
+auth     required  pam_env.so readenv=1
+auth     required  pam_env.so readenv=1 envfile=/etc/default/locale
 @include common-auth
+-auth    optional  pam_gnome_keyring.so
+-auth    optional  pam_kwallet5.so
+
 @include common-account
-@include common-session
+
 @include common-password
+
+@include common-session
+-session optional  pam_gnome_keyring.so auto_start
+-session optional  pam_kwallet5.so auto_start