cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

backport fix from upstream git to make the sshd lens much more flexible

Browse Source 
GH issue #75
This commit is contained in:
jasper 2014-03-09 19:47:18 +00:00
parent f191dd5a28
commit 41b6ebe42b
2 changed files with 45 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sysutils/augeas/Makefile
View File

@ -1,8 +1,9 @@
# $OpenBSD: Makefile,v 1.23 2014/02/06 10:21:09 jasper Exp $
# $OpenBSD: Makefile,v 1.24 2014/03/09 19:47:18 jasper Exp $
COMMENT= configuration editing tool and API
DISTNAME= augeas-1.2.0
REVISION= 0
CATEGORIES= sysutils devel
SHARED_LIBS += augeas 0.0 # 16.0

43
sysutils/augeas/patches/patch-lenses_sshd_aug Normal file
View File

@ -0,0 +1,43 @@
$OpenBSD: patch-lenses_sshd_aug,v 1.1 2014/03/09 19:47:18 jasper Exp $
From 1b299d58bbebd6551412bd721838e9e582a81a07 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Pinson?= <raphael.pinson@camptocamp.com>
Date: Fri, 21 Feb 2014 08:09:06 +0100
Subject: [PATCH] Sshd: Allow all types of issues in Match groups (GH issue #75)
--- lenses/sshd.aug.orig Mon Jan 27 11:36:08 2014
+++ lenses/sshd.aug Sat Feb 22 13:30:39 2014
@@ -114,6 +114,11 @@ module Sshd =
let kexalgorithms = list /KexAlgorithms/i "KexAlgorithms"
+ let entry = accept_env | allow_groups | allow_users
+ | deny_groups | subsystem | deny_users
+ | macs | ciphers | kexalgorithms
+ | other_entry
+
let condition_entry =
let value = store /[^ \t\n]+/ in
[ sep . key /[A-Za-z0-9]+/ . sep . value ]
@@ -121,18 +126,15 @@ module Sshd =
let match_cond =
[ label "Condition" . condition_entry+ . eol ]
- let match_entry =
- ( (indent . comment_noindent) | empty | (indent . other_entry) )
+ let match_entry = indent . (entry | comment_noindent)
+ | empty
let match =
[ key /Match/i . match_cond
. [ label "Settings" . match_entry+ ]
]
- let lns = (comment | empty | accept_env | allow_groups | allow_users
- | deny_groups | subsystem | deny_users
- | macs | ciphers | kexalgorithms
- | other_entry ) * . match*
+ let lns = (entry | comment | empty)* . match*
let xfm = transform lns (incl "/etc/ssh/sshd_config")