diff options
author | Damien Miller <djm@mindrot.org> | 1999-11-12 15:19:27 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 1999-11-12 15:19:27 +1100 |
commit | 6d7b2cd1a32efa2a40c97361065d357a2e60b716 (patch) | |
tree | 9c34abc2723760ce00b6f3867d7e0cfbd6a7424e /channels.c | |
parent | b5f8927a7e3f25cef4c66603a780176e1b9f6082 (diff) |
- Merged yet more changes from OpenBSD CVS
- [auth-rh-rsa.c auth-rhosts.c auth-rsa.c channels.c clientloop.c]
[ssh.c ssh.h sshconnect.c sshd.c]
make all access to options via 'extern Options options'
and 'extern ServerOptions options' respectively;
options are no longer passed as arguments:
* make options handling more consistent
* remove #include "readconf.h" from ssh.h
* readconf.h is only included if necessary
- [mpaux.c] clear temp buffer
- [servconf.c] print _all_ bad options found in configfile
Diffstat (limited to 'channels.c')
-rw-r--r-- | channels.c | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -16,7 +16,7 @@ arbitrary tcp/ip connections, and the authentication agent connection. */ #include "includes.h" -RCSID("$Id: channels.c,v 1.4 1999/11/08 05:15:55 damien Exp $"); +RCSID("$Id: channels.c,v 1.5 1999/11/12 04:19:27 damien Exp $"); #include "ssh.h" #include "packet.h" @@ -24,6 +24,7 @@ RCSID("$Id: channels.c,v 1.4 1999/11/08 05:15:55 damien Exp $"); #include "buffer.h" #include "authfd.h" #include "uidswap.h" +#include "readconf.h" #include "servconf.h" #include "channels.h" |