|
Jan F |
94df89 |
diff -up openssh-5.8p2/ssh-ldap.conf.5.ldap2 openssh-5.8p2/ssh-ldap.conf.5
|
|
Jan F |
94df89 |
--- openssh-5.8p2/ssh-ldap.conf.5.ldap2 2011-05-24 18:21:31.851167623 +0200
|
|
Jan F |
94df89 |
+++ openssh-5.8p2/ssh-ldap.conf.5 2011-05-24 18:28:20.301116545 +0200
|
|
Jan F |
94df89 |
@@ -41,6 +41,7 @@ Quoting values that contain blanks
|
|
Jan F |
94df89 |
may be incorrect, as the quotes would become part of the value.
|
|
Jan F |
94df89 |
The possible keywords and their meanings are as follows (note that
|
|
Jan F |
94df89 |
keywords are case-insensitive, and arguments, on a case by case basis, may be case-sensitive).
|
|
Jan F |
94df89 |
+.Bl -tag -width Ds
|
|
Jan F |
94df89 |
.It Cm URI
|
|
Jan F |
94df89 |
The argument(s) are in the form
|
|
Jan F |
94df89 |
.Pa ldap[si]://[name[:port]]
|
|
Jan F |
94df89 |
@@ -208,7 +209,7 @@ and
|
|
Jan F |
94df89 |
are the aliases for
|
|
Jan F |
94df89 |
.Dq no .
|
|
Jan F |
94df89 |
If
|
|
Jan F |
94df89 |
-.Dqstart_tls
|
|
Jan F |
94df89 |
+.Dq start_tls
|
|
Jan F |
94df89 |
is specified then StartTLS is used rather than raw LDAP over SSL.
|
|
Jan F |
94df89 |
The default for ldap:// is
|
|
Jan F |
94df89 |
.Dq start_tls ,
|
|
Jan F |
94df89 |
@@ -357,11 +358,13 @@ There is no default.
|
|
Jan F |
94df89 |
.It Cm SSH_Filter
|
|
Jan F |
94df89 |
Specifies the user filter applied on the LDAP serch.
|
|
Jan F |
94df89 |
The default is no filter.
|
|
Jan F |
94df89 |
+.El
|
|
Jan F |
94df89 |
.Sh FILES
|
|
Jan F |
94df89 |
.Bl -tag -width Ds
|
|
Jan F |
94df89 |
.It Pa /etc/ssh/ldap.conf
|
|
Jan F |
94df89 |
Ldap configuration file for
|
|
Jan F |
94df89 |
.Xr ssh-ldap-helper 8 .
|
|
Jan F |
94df89 |
+.El
|
|
Jan F |
94df89 |
.Sh "SEE ALSO"
|
|
Jan F |
94df89 |
.Xr ldap.conf 5 ,
|
|
Jan F |
94df89 |
.Xr ssh-ldap-helper 8
|
|
Jan F |
94df89 |
diff -up openssh-5.8p2/ssh-ldap-helper.8.ldap2 openssh-5.8p2/ssh-ldap-helper.8
|
|
Jan F |
94df89 |
--- openssh-5.8p2/ssh-ldap-helper.8.ldap2 2011-05-24 18:29:33.476168165 +0200
|
|
Jan F |
94df89 |
+++ openssh-5.8p2/ssh-ldap-helper.8 2011-05-24 18:30:47.030173237 +0200
|
|
Jan F |
94df89 |
@@ -66,7 +66,7 @@ increases verbosity.
|
|
Jan F |
94df89 |
.It Fl w
|
|
Jan F |
94df89 |
.Nm
|
|
Jan F |
94df89 |
writes warnings about unknown items in the ldap.conf configuration file.
|
|
Jan F |
94df89 |
-
|
|
Jan F |
94df89 |
+.El
|
|
Jan F |
94df89 |
.Sh SEE ALSO
|
|
Jan F |
94df89 |
.Xr sshd 8 ,
|
|
Jan F |
94df89 |
.Xr sshd_config 5 ,
|