summaryrefslogtreecommitdiff
path: root/session.c
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2019-01-19 21:31:32 +0000
committerDamien Miller <djm@mindrot.org>2019-01-20 09:02:10 +1100
commit0fa174ebe129f3d0aeaf4e2d1dd8de745870d0ff (patch)
tree8ce7eacecf1200d6cb95cd01e87416cc6a3b1af7 /session.c
parent4ae7f80dfd02f2bde912a67c9f338f61e90fa79f (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 'session.c')
-rw-r--r--session.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/session.c b/session.c
index 0452f507a..f0dabe111 100644
--- a/session.c
+++ b/session.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: session.c,v 1.309 2019/01/17 04:45:09 djm Exp $ */ 1/* $OpenBSD: session.c,v 1.310 2019/01/19 21:31:32 djm Exp $ */
2/* 2/*
3 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 3 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
4 * All rights reserved 4 * All rights reserved
@@ -105,6 +105,9 @@
105#include <selinux/selinux.h> 105#include <selinux/selinux.h>
106#endif 106#endif
107 107
108#include "opacket.h" /* XXX */
109extern struct ssh *active_state; /* XXX */
110
108#define IS_INTERNAL_SFTP(c) \ 111#define IS_INTERNAL_SFTP(c) \
109 (!strncmp(c, INTERNAL_SFTP_NAME, sizeof(INTERNAL_SFTP_NAME) - 1) && \ 112 (!strncmp(c, INTERNAL_SFTP_NAME, sizeof(INTERNAL_SFTP_NAME) - 1) && \
110 (c[sizeof(INTERNAL_SFTP_NAME) - 1] == '\0' || \ 113 (c[sizeof(INTERNAL_SFTP_NAME) - 1] == '\0' || \