diff options
author | djm@openbsd.org <djm@openbsd.org> | 2019-01-19 21:31:32 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2019-01-20 09:02:10 +1100 |
commit | 0fa174ebe129f3d0aeaf4e2d1dd8de745870d0ff (patch) | |
tree | 8ce7eacecf1200d6cb95cd01e87416cc6a3b1af7 /sshd.c | |
parent | 4ae7f80dfd02f2bde912a67c9f338f61e90fa79f (diff) |
upstream: begin landing remaining refactoring of packet parsing
API, started almost exactly six years ago.
This change stops including the old packet_* API by default and makes
each file that requires the old API include it explicitly. We will
commit file-by-file refactoring to remove the old API in consistent
steps.
with & ok markus@
OpenBSD-Commit-ID: 93c98a6b38f6911fd1ae025a1ec57807fb4d4ef4
Diffstat (limited to 'sshd.c')
-rw-r--r-- | sshd.c | 5 |
1 files changed, 4 insertions, 1 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: sshd.c,v 1.521 2019/01/17 01:50:24 djm Exp $ */ | 1 | /* $OpenBSD: sshd.c,v 1.522 2019/01/19 21:31:32 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
@@ -123,6 +123,9 @@ | |||
123 | #include "version.h" | 123 | #include "version.h" |
124 | #include "ssherr.h" | 124 | #include "ssherr.h" |
125 | 125 | ||
126 | #include "opacket.h" /* XXX */ | ||
127 | extern struct ssh *active_state; /* XXX move decl to this file */ | ||
128 | |||
126 | /* Re-exec fds */ | 129 | /* Re-exec fds */ |
127 | #define REEXEC_DEVCRYPTO_RESERVED_FD (STDERR_FILENO + 1) | 130 | #define REEXEC_DEVCRYPTO_RESERVED_FD (STDERR_FILENO + 1) |
128 | #define REEXEC_STARTUP_PIPE_FD (STDERR_FILENO + 2) | 131 | #define REEXEC_STARTUP_PIPE_FD (STDERR_FILENO + 2) |