Skip to content

Commit

Permalink
debian/authd.gdm-authd: Use exec module for the GDM case
Browse files Browse the repository at this point in the history
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
  • Loading branch information
3v1n0 committed Apr 11, 2024
1 parent ec0ce46 commit af15a1a
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 5 deletions.
4 changes: 2 additions & 2 deletions debian/authd.gdm-authd.pam → debian/authd.gdm-authd.pam.in
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
#%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

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.
Expand Down
2 changes: 0 additions & 2 deletions debian/install
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion debian/rules
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit af15a1a

Please sign in to comment.