From dee002155b919cb769f9c417e7e263443a181a9e Mon Sep 17 00:00:00 2001 From: Namkhai B Date: Mon, 6 Jan 2020 11:17:15 -0600 Subject: [PATCH] Remove FreeBSD-specific PAM configuration Something in FreeBSD's PAM modules changed, and now using the "passwd" configuration file fails to unlock --- meson.build | 17 ++++------------- pam/{swaylock.linux => swaylock} | 0 pam/swaylock.freebsd | 6 ------ 3 files changed, 4 insertions(+), 19 deletions(-) rename pam/{swaylock.linux => swaylock} (100%) delete mode 100644 pam/swaylock.freebsd diff --git a/meson.build b/meson.build index 3110e8e..5c460bb 100644 --- a/meson.build +++ b/meson.build @@ -152,19 +152,10 @@ executable('swaylock', install: true ) -if is_freebsd - install_data( - 'pam/swaylock.freebsd', - install_dir: sysconfdir + '/pam.d/', - rename: 'swaylock' - ) -else - install_data( - 'pam/swaylock.linux', - install_dir: sysconfdir + '/pam.d/', - rename: 'swaylock' - ) -endif +install_data( + 'pam/swaylock', + install_dir: sysconfdir + '/pam.d/' +) if scdoc.found() sh = find_program('sh') diff --git a/pam/swaylock.linux b/pam/swaylock similarity index 100% rename from pam/swaylock.linux rename to pam/swaylock diff --git a/pam/swaylock.freebsd b/pam/swaylock.freebsd deleted file mode 100644 index 603fc18..0000000 --- a/pam/swaylock.freebsd +++ /dev/null @@ -1,6 +0,0 @@ -# -# PAM configuration file for the swaylock screen locker. By default, it includes -# the 'passwd' configuration file (see /etc/pam.d/passwd) -# - -auth include passwd