feat(pam): dont use OPIE modules

rkojedzinszky · rkojedzinszky · commit 127202dbbce6 · 2024-11-05T10:41:24.000+01:00
In response to: commit 0aa2700123e22c2b0a977375e087dc2759b8e980 Author: Dag-Erling Smørgrav <des@FreeBSD.org> Date: Sun Oct 2 03:37:29 2022 +0200 Put OPIE to rest. Differential Revision: https://reviews.freebsd.org/D36592
diff --git a/src/middlewared/middlewared/etc_files/pam.d/ftp b/src/middlewared/middlewared/etc_files/pam.d/ftp
@@ -8,8 +8,6 @@
         dsp = pam.getDirectoryServicePam(middleware=middleware, file='ftp')
 %>
 # auth
-auth		sufficient	pam_opie.so		no_warn no_fake_prompts
-auth		requisite	pam_opieaccess.so	no_warn allow_local
 % if dsp.enabled() and dsp.name() != 'NIS':
 ${dsp.pam_auth()}
 % endif
diff --git a/src/middlewared/middlewared/etc_files/pam.d/ftpd b/src/middlewared/middlewared/etc_files/pam.d/ftpd
@@ -8,8 +8,6 @@
         dsp = pam.getDirectoryServicePam(middleware=middleware, file='ftpd')
 %>
 # auth
-auth		sufficient	pam_opie.so		no_warn no_fake_prompts
-auth		requisite	pam_opieaccess.so	no_warn allow_local
 % if dsp.enabled() and dsp.name() != 'NIS':
 ${dsp.pam_auth()}
 % endif
diff --git a/src/middlewared/middlewared/etc_files/pam.d/netatalk b/src/middlewared/middlewared/etc_files/pam.d/netatalk
@@ -6,8 +6,6 @@
     dsp = pam.getDirectoryServicePam(middleware=middleware, file='netatalk')
 %>
 # auth
-auth		sufficient	pam_opie.so		no_warn no_fake_prompts
-auth		requisite	pam_opieaccess.so	no_warn allow_local
 % if dsp.enabled() and dsp.name() != 'NIS':
 ${dsp.pam_auth()}
 % endif
diff --git a/src/middlewared/middlewared/etc_files/pam.d/other b/src/middlewared/middlewared/etc_files/pam.d/other
@@ -5,8 +5,6 @@
 #
 
 # auth
-auth		sufficient	pam_opie.so		no_warn no_fake_prompts
-auth		requisite	pam_opieaccess.so	no_warn allow_local
 #auth		sufficient	pam_krb5.so		no_warn try_first_pass
 #auth		sufficient	pam_ssh.so		no_warn try_first_pass
 auth		required	pam_unix.so		no_warn try_first_pass
diff --git a/src/middlewared/middlewared/etc_files/pam.d/samba b/src/middlewared/middlewared/etc_files/pam.d/samba
@@ -6,8 +6,6 @@
     dsp = pam.getDirectoryServicePam(middleware=middleware, file='samba')
 %>
 # auth
-auth		sufficient	pam_opie.so		no_warn no_fake_prompts
-auth		requisite	pam_opieaccess.so	no_warn allow_local
 % if dsp.enabled() and dsp.name() != 'NIS':
 ${dsp.pam_auth()}
 % endif
diff --git a/src/middlewared/middlewared/etc_files/pam.d/sshd b/src/middlewared/middlewared/etc_files/pam.d/sshd
@@ -10,8 +10,6 @@
 	twofactor_enabled = twofactor_auth['enabled'] and twofactor_auth['services']['ssh']
 %>\
 # auth
-auth		sufficient	pam_opie.so		no_warn no_fake_prompts
-auth		requisite	pam_opieaccess.so	no_warn allow_local
 % if dsp.enabled() and dsp.name() != 'NIS' and not twofactor_enabled:
 ${dsp.pam_auth()}
 % endif
diff --git a/src/middlewared/middlewared/etc_files/pam.d/sudo b/src/middlewared/middlewared/etc_files/pam.d/sudo
@@ -8,8 +8,6 @@
     dsp = pam.getDirectoryServicePam(middleware=middleware, file='sudo')
 %>
 # auth
-auth		sufficient	pam_opie.so		no_warn no_fake_prompts
-auth		requisite	pam_opieaccess.so	no_warn allow_local
 % if dsp.enabled() and dsp.name() == 'LDAP':
 ${dsp.pam_auth()}
 % endif
diff --git a/src/middlewared/middlewared/etc_files/pam.d/system b/src/middlewared/middlewared/etc_files/pam.d/system
@@ -5,8 +5,6 @@
 #
 
 # auth
-auth		sufficient	pam_opie.so		no_warn no_fake_prompts
-auth		requisite	pam_opieaccess.so	no_warn allow_local
 #auth		sufficient	pam_krb5.so		no_warn try_first_pass
 #auth		sufficient	pam_ssh.so		no_warn try_first_pass
 auth		required	pam_unix.so		no_warn try_first_pass nullok
diff --git a/src/middlewared/middlewared/etc_files/pam.d/telnetd b/src/middlewared/middlewared/etc_files/pam.d/telnetd
@@ -5,8 +5,6 @@
 #
 
 # auth
-auth		sufficient	pam_opie.so		no_warn no_fake_prompts
-auth		requisite	pam_opieaccess.so	no_warn allow_local
 #auth		sufficient	pam_krb5.so		no_warn try_first_pass
 #auth		sufficient	pam_ssh.so		no_warn try_first_pass
 auth		required	pam_unix.so		no_warn try_first_pass

Original file line number	Diff line number	Diff line change
`@@ -5,8 +5,6 @@`
`5`	`5`	`#`
`6`	`6`
`7`	`7`	`# auth`
`8`		`-auth sufficient pam_opie.so no_warn no_fake_prompts`
`9`		`-auth requisite pam_opieaccess.so no_warn allow_local`
`10`	`8`	`#auth sufficient pam_krb5.so no_warn try_first_pass`
`11`	`9`	`#auth sufficient pam_ssh.so no_warn try_first_pass`
`12`	`10`	`auth required pam_unix.so no_warn try_first_pass`