diff options
-rw-r--r-- | ChangeLog | 8 | ||||
-rw-r--r-- | ssh_config.5 | 20 |
2 files changed, 26 insertions, 2 deletions
@@ -1,3 +1,9 @@ | |||
1 | 20030628 | ||
2 | - (dtucker) OpenBSD CVS Sync | ||
3 | - markus@cvs.openbsd.org 2003/06/23 09:02:44 | ||
4 | [ssh_config.5] | ||
5 | document EnableSSHKeysign; bugzilla #599; ok deraadt@, jmc@ | ||
6 | |||
1 | 20030624 | 7 | 20030624 |
2 | - (dtucker) Have configure refer the user to config.log and | 8 | - (dtucker) Have configure refer the user to config.log and |
3 | contrib/findssl.sh for OpenSSL header/library mismatches. | 9 | contrib/findssl.sh for OpenSSL header/library mismatches. |
@@ -583,4 +589,4 @@ | |||
583 | - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. | 589 | - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. |
584 | Report from murple@murple.net, diagnosis from dtucker@zip.com.au | 590 | Report from murple@murple.net, diagnosis from dtucker@zip.com.au |
585 | 591 | ||
586 | $Id: ChangeLog,v 1.2823 2003/06/24 10:22:09 dtucker Exp $ | 592 | $Id: ChangeLog,v 1.2824 2003/06/28 02:33:12 dtucker Exp $ |
diff --git a/ssh_config.5 b/ssh_config.5 index 85a686b08..56df3acec 100644 --- a/ssh_config.5 +++ b/ssh_config.5 | |||
@@ -34,7 +34,7 @@ | |||
34 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | 34 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
35 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 35 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
36 | .\" | 36 | .\" |
37 | .\" $OpenBSD: ssh_config.5,v 1.13 2003/06/10 09:12:12 jmc Exp $ | 37 | .\" $OpenBSD: ssh_config.5,v 1.14 2003/06/23 09:02:44 markus Exp $ |
38 | .Dd September 25, 1999 | 38 | .Dd September 25, 1999 |
39 | .Dt SSH_CONFIG 5 | 39 | .Dt SSH_CONFIG 5 |
40 | .Os | 40 | .Os |
@@ -252,6 +252,24 @@ will act as a SOCKS4 server. | |||
252 | Multiple forwardings may be specified, and | 252 | Multiple forwardings may be specified, and |
253 | additional forwardings can be given on the command line. | 253 | additional forwardings can be given on the command line. |
254 | Only the superuser can forward privileged ports. | 254 | Only the superuser can forward privileged ports. |
255 | .It Cm EnableSSHKeysign | ||
256 | Setting this option to | ||
257 | .Dq yes | ||
258 | in the global client configuration file | ||
259 | .Pa /etc/ssh/ssh_config | ||
260 | enables the use of the helper program | ||
261 | .Xr ssh-keysign 8 | ||
262 | during | ||
263 | .Cm HostbasedAuthentication . | ||
264 | The argument must be | ||
265 | .Dq yes | ||
266 | or | ||
267 | .Dq no . | ||
268 | The default is | ||
269 | .Dq no . | ||
270 | See | ||
271 | .Xr ssh-keysign 8 | ||
272 | for more information. | ||
255 | .It Cm EscapeChar | 273 | .It Cm EscapeChar |
256 | Sets the escape character (default: | 274 | Sets the escape character (default: |
257 | .Ql ~ ) . | 275 | .Ql ~ ) . |