From af15a1afa87d6fc4b7e332b3bba95000f8ef0202 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= <mail@3v1n0.net>
Date: Mon, 8 Apr 2024 00:32:08 +0200
Subject: [PATCH] debian/authd.gdm-authd: Use exec module for the GDM case

In this way we are consistent and we always use the same mode to run the
exec module, making possible to share module data in all the instances
---
 debian/{authd.gdm-authd.pam => authd.gdm-authd.pam.in} | 4 ++--
 debian/install                                         | 2 --
 debian/rules                                           | 2 +-
 3 files changed, 3 insertions(+), 5 deletions(-)
 rename debian/{authd.gdm-authd.pam => authd.gdm-authd.pam.in} (92%)

diff --git a/debian/authd.gdm-authd.pam b/debian/authd.gdm-authd.pam.in
similarity index 92%
rename from debian/authd.gdm-authd.pam
rename to debian/authd.gdm-authd.pam.in
index 020f430c4..b55bdeb43 100644
--- a/debian/authd.gdm-authd.pam
+++ b/debian/authd.gdm-authd.pam.in
@@ -1,6 +1,6 @@
 #%PAM-1.0
 auth    [success=ok user_unknown=ignore default=bad] pam_succeed_if.so user != root quiet_success
-auth    [success=1 ignore=ignore default=die] pam_authd.so
+auth    [success=1 ignore=ignore default=die] pam_authd_exec.so @AUTHD_DAEMONS_PATH@/authd-pam
 # If authd ignored the request => local broker is selected,
 # then we continue with normal stack
 auth    substack        common-auth
@@ -8,7 +8,7 @@ auth    substack        common-auth
 auth    requisite       pam_nologin.so
 auth    optional        pam_gnome_keyring.so
 
-account [default=ignore success=ok user_unknown=ignore]	pam_authd.so
+account [default=ignore success=ok user_unknown=ignore]	pam_authd_exec.so @AUTHD_DAEMONS_PATH@/authd-pam
 # This is potentially loading pam_authd.again but we've checks in AcctMgmt() to
 # prevent this to happen when the gdm-authd service is used without GDM extensions.
 # Plus the model used by the services is different, so there's no risk for this to happen.
diff --git a/debian/install b/debian/install
index a3c3f6117..3cdd87123 100755
--- a/debian/install
+++ b/debian/install
@@ -10,8 +10,6 @@ usr/bin/pam => ${env:AUTHD_DAEMONS_PATH}/authd-pam
 debian/pam-configs/authd /usr/share/pam-configs
 
 # PAM libraries
-${env:BUILT_PAM_LIBS_PATH}/pam_authd.so ${env:AUTHD_PAM_MODULES_PATH}
-${env:BUILT_PAM_LIBS_PATH}/go-loader/pam_authd_loader.so ${env:AUTHD_PAM_MODULES_PATH}
 ${env:BUILT_PAM_LIBS_PATH}/go-exec/pam_authd_exec.so ${env:AUTHD_PAM_MODULES_PATH}
 
 # Install NSS library with right soname
diff --git a/debian/rules b/debian/rules
index 0fffdbfac..35831a087 100755
--- a/debian/rules
+++ b/debian/rules
@@ -79,7 +79,7 @@ override_dh_auto_configure:
 	touch debian/cargo-checksum.json
 	dh_auto_configure --buildsystem=cargo
 
-	for i in debian/*.service.in debian/pam-configs/*.in; do \
+	for i in debian/*.service.in debian/pam-configs/*.in *.pam.in; do \
 		sed s,@AUTHD_DAEMONS_PATH@,$(AUTHD_DAEMONS_PATH),g $$i > $${i%.*}; \
 	done