diff options
| author | Damien Miller <djm@mindrot.org> | 2000-05-09 11:02:59 +1000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2000-05-09 11:02:59 +1000 |
| commit | 30c3d429306bb4afe71c18db92816b981f7b6d9d (patch) | |
| tree | a65f45e0073cb55ad42957a36b4636ff21405108 /readconf.h | |
| parent | 61e50f10c276009bf9472fdd797bf6be60fc2a83 (diff) | |
- OpenBSD CVS update
- markus@cvs.openbsd.org
[cipher.h myproposal.h readconf.c readconf.h servconf.c ssh.1 ssh.c]
[ssh.h sshconnect1.c sshconnect2.c sshd.8]
- complain about invalid ciphers in SSH1 (e.g. arcfour is SSH2 only)
- hugh@cvs.openbsd.org
[ssh.1]
- zap typo
[ssh-keygen.1]
- One last nit fix. (markus approved)
[sshd.8]
- some markus certified spelling adjustments
- markus@cvs.openbsd.org
[auth2.c channels.c clientloop.c compat compat.h dsa.c kex.c]
[sshconnect2.c ]
- bug compat w/ ssh-2.0.13 x11, split out bugs
[nchan.c]
- no drain if ibuf_empty, fixes x11fwd problems; tests by fries@
[ssh-keygen.c]
- handle escapes in real and original key format, ok millert@
[version.h]
- OpenSSH-2.1
Diffstat (limited to 'readconf.h')
| -rw-r--r-- | readconf.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/readconf.h b/readconf.h index ba53542d9..3f0e44254 100644 --- a/readconf.h +++ b/readconf.h | |||
| @@ -13,7 +13,7 @@ | |||
| 13 | * | 13 | * |
| 14 | */ | 14 | */ |
| 15 | 15 | ||
| 16 | /* RCSID("$Id: readconf.h,v 1.10 2000/05/07 02:03:17 damien Exp $"); */ | 16 | /* RCSID("$Id: readconf.h,v 1.11 2000/05/09 01:03:01 damien Exp $"); */ |
| 17 | 17 | ||
| 18 | #ifndef READCONF_H | 18 | #ifndef READCONF_H |
| 19 | #define READCONF_H | 19 | #define READCONF_H |
| @@ -65,7 +65,7 @@ typedef struct { | |||
| 65 | int number_of_password_prompts; /* Max number of password | 65 | int number_of_password_prompts; /* Max number of password |
| 66 | * prompts. */ | 66 | * prompts. */ |
| 67 | int cipher; /* Cipher to use. */ | 67 | int cipher; /* Cipher to use. */ |
| 68 | char *ciphers; /* Ciphers in order of preference. */ | 68 | char *ciphers; /* SSH2 ciphers in order of preference. */ |
| 69 | int protocol; /* Protocol in order of preference. */ | 69 | int protocol; /* Protocol in order of preference. */ |
| 70 | char *hostname; /* Real host to connect. */ | 70 | char *hostname; /* Real host to connect. */ |
| 71 | char *proxy_command; /* Proxy command for connecting the host. */ | 71 | char *proxy_command; /* Proxy command for connecting the host. */ |