diff options
| author | deraadt@openbsd.org <deraadt@openbsd.org> | 2015-07-30 19:23:02 +0000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2015-08-02 19:59:25 +1000 |
| commit | f4373ed1e8fbc7c8ce3fc4ea97d0ba2e0c1d7ef0 (patch) | |
| tree | b8e3396035624e97e931d2058a84487f2ad9463e /sshd_config.5 | |
| parent | 0c30ba91f87fcda7e975e6ff8a057f624e87ea1c (diff) | |
upstream commit
change default: PermitRootLogin without-password matching
install script changes coming as well ok djm markus
Upstream-ID: 0e2a6c4441daf5498b47a61767382bead5eb8ea6
Diffstat (limited to 'sshd_config.5')
| -rw-r--r-- | sshd_config.5 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sshd_config.5 b/sshd_config.5 index 2808576a9..6eec1f668 100644 --- a/sshd_config.5 +++ b/sshd_config.5 | |||
| @@ -33,7 +33,7 @@ | |||
| 33 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | 33 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
| 34 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 34 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 35 | .\" | 35 | .\" |
| 36 | .\" $OpenBSD: sshd_config.5,v 1.208 2015/07/30 00:01:34 djm Exp $ | 36 | .\" $OpenBSD: sshd_config.5,v 1.209 2015/07/30 19:23:02 deraadt Exp $ |
| 37 | .Dd $Mdocdate: July 30 2015 $ | 37 | .Dd $Mdocdate: July 30 2015 $ |
| 38 | .Dt SSHD_CONFIG 5 | 38 | .Dt SSHD_CONFIG 5 |
| 39 | .Os | 39 | .Os |
| @@ -1209,7 +1209,7 @@ The argument must be | |||
| 1209 | or | 1209 | or |
| 1210 | .Dq no . | 1210 | .Dq no . |
| 1211 | The default is | 1211 | The default is |
| 1212 | .Dq no . | 1212 | .Dq without-password . |
| 1213 | .Pp | 1213 | .Pp |
| 1214 | If this option is set to | 1214 | If this option is set to |
| 1215 | .Dq without-password , | 1215 | .Dq without-password , |