diff options
| author |   jmc <jmc@openbsd.org> | 2016-04-27 13:53:48 +0000 |
|---|---|---|
| committer | jmc <jmc@openbsd.org> | 2016-04-27 13:53:48 +0000 |
| commit | a2932f7b5539783e8edffe6ab1edb8883f335849 (patch) | |
| tree | 01671d902860ac88b74723dbdc01929e78be13cb | |
| parent | unbreak pledge/generic test (breaked since ?) (diff) | |
| download | wireguard-openbsd-a2932f7b5539783e8edffe6ab1edb8883f335849.tar.xz wireguard-openbsd-a2932f7b5539783e8edffe6ab1edb8883f335849.zip | |
cidr permitted for {allow,deny}users; from lars nooden
ok djm
| -rw-r--r-- | usr.bin/ssh/sshd_config.5 | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/usr.bin/ssh/sshd_config.5 b/usr.bin/ssh/sshd_config.5 index 4f52988f8cd..85a5621aadb 100644 --- a/usr.bin/ssh/sshd_config.5 +++ b/usr.bin/ssh/sshd_config.5 @@ -33,8 +33,8 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $OpenBSD: sshd_config.5,v 1.221 2016/03/17 17:19:43 djm Exp $ -.Dd $Mdocdate: March 17 2016 $ +.\" $OpenBSD: sshd_config.5,v 1.222 2016/04/27 13:53:48 jmc Exp $ +.Dd $Mdocdate: April 27 2016 $ .Dt SSHD_CONFIG 5 .Os .Sh NAME @@ -173,6 +173,8 @@ By default, login is allowed for all users. If the pattern takes the form USER@HOST then USER and HOST are separately checked, restricting logins to particular users from particular hosts. +HOST criteria may additionally contain addresses to match in CIDR +address/masklen format. The allow/deny directives are processed in the following order: .Cm DenyUsers , .Cm AllowUsers , @@ -561,6 +563,8 @@ By default, login is allowed for all users. If the pattern takes the form USER@HOST then USER and HOST are separately checked, restricting logins to particular users from particular hosts. +HOST criteria may additionally contain addresses to match in CIDR +address/masklen format. The allow/deny directives are processed in the following order: .Cm DenyUsers , .Cm AllowUsers , |