diff options
| author | Ed Maste <emaste@FreeBSD.org> | 2021-08-31 19:30:50 +0000 |
|---|---|---|
| committer | Ed Maste <emaste@FreeBSD.org> | 2021-09-15 01:42:06 +0000 |
| commit | 2198a308adedbd064db696f388e8dd93217366e4 (patch) | |
| tree | b849556c098719d2ad08c336084947681f059ba3 /crypto/openssh/ssh_namespace.h | |
| parent | c519a52692c71f40a7241b108cd4aa90eb5c5b67 (diff) | |
| download | src-2198a308adedbd064db696f388e8dd93217366e4.tar.gz src-2198a308adedbd064db696f388e8dd93217366e4.zip | |
openssh: simplify login class restrictions
Login class-based restrictions were introduced in 5b400a39b8ad. The
code was adapted for sshd's Capsicum sandbox and received many changes
over time, including at least fc3c19a9fcee, bd393de91cc3, and
e8c56fba2926.
During an attempt to upstream the work a much simpler approach was
suggested. Adopt it now in the in-tree OpenSSH to reduce conflicts with
future updates.
Submitted by: Yuchiro Naito (against OpenSSH-portable on GitHub)
Obtained from: https://github.com/openssh/openssh-portable/pull/262
Reviewed by: allanjude, kevans
MFC after: 2 weeks
Differential Revision: https://reviews.freebsd.org/D31760
(cherry picked from commit 27ceebbc2402e4c98203c7eef9696f4bd3d326f8)
Diffstat (limited to 'crypto/openssh/ssh_namespace.h')
| -rw-r--r-- | crypto/openssh/ssh_namespace.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/crypto/openssh/ssh_namespace.h b/crypto/openssh/ssh_namespace.h index cbef93df67b9..71accdf4fb59 100644 --- a/crypto/openssh/ssh_namespace.h +++ b/crypto/openssh/ssh_namespace.h @@ -658,7 +658,6 @@ #define sshbuf_dump_data Fssh_sshbuf_dump_data #define sshbuf_dup_string Fssh_sshbuf_dup_string #define sshbuf_free Fssh_sshbuf_free -#define sshbuf_free_passwd Fssh_sshbuf_free_passwd #define sshbuf_from Fssh_sshbuf_from #define sshbuf_fromb Fssh_sshbuf_fromb #define sshbuf_froms Fssh_sshbuf_froms @@ -669,7 +668,6 @@ #define sshbuf_get_cstring Fssh_sshbuf_get_cstring #define sshbuf_get_ec Fssh_sshbuf_get_ec #define sshbuf_get_eckey Fssh_sshbuf_get_eckey -#define sshbuf_get_passwd Fssh_sshbuf_get_passwd #define sshbuf_get_string Fssh_sshbuf_get_string #define sshbuf_get_string_direct Fssh_sshbuf_get_string_direct #define sshbuf_get_stringb Fssh_sshbuf_get_stringb @@ -691,7 +689,6 @@ #define sshbuf_put_cstring Fssh_sshbuf_put_cstring #define sshbuf_put_ec Fssh_sshbuf_put_ec #define sshbuf_put_eckey Fssh_sshbuf_put_eckey -#define sshbuf_put_passwd Fssh_sshbuf_put_passwd #define sshbuf_put_string Fssh_sshbuf_put_string #define sshbuf_put_stringb Fssh_sshbuf_put_stringb #define sshbuf_put_u16 Fssh_sshbuf_put_u16 |