diff options
author | djm@openbsd.org <djm@openbsd.org> | 2019-01-19 21:43:56 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2019-01-20 09:45:18 +1100 |
commit | 04c091fc199f17dacf8921df0a06634b454e2722 (patch) | |
tree | 76b75b5cf39f940bfc418fa7fe6e9ae3dc5c2569 /ssh.c | |
parent | ec00f918b8ad90295044266c433340a8adc93452 (diff) |
upstream: remove last references to active_state
with & ok markus@
OpenBSD-Commit-ID: 78619a50ea7e4ca2f3b54d4658b3227277490ba2
Diffstat (limited to 'ssh.c')
-rw-r--r-- | ssh.c | 5 |
1 files changed, 1 insertions, 4 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssh.c,v 1.499 2019/01/19 21:36:06 djm Exp $ */ | 1 | /* $OpenBSD: ssh.c,v 1.500 2019/01/19 21:43:56 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 |
@@ -113,8 +113,6 @@ | |||
113 | #include "ssh-pkcs11.h" | 113 | #include "ssh-pkcs11.h" |
114 | #endif | 114 | #endif |
115 | 115 | ||
116 | extern struct ssh *active_state; /* XXX remove after sshconnect2.c updated */ | ||
117 | |||
118 | extern char *__progname; | 116 | extern char *__progname; |
119 | 117 | ||
120 | /* Saves a copy of argv for setproctitle emulation */ | 118 | /* Saves a copy of argv for setproctitle emulation */ |
@@ -652,7 +650,6 @@ main(int ac, char **av) | |||
652 | */ | 650 | */ |
653 | if ((ssh = ssh_alloc_session_state()) == NULL) | 651 | if ((ssh = ssh_alloc_session_state()) == NULL) |
654 | fatal("Couldn't allocate session state"); | 652 | fatal("Couldn't allocate session state"); |
655 | active_state = ssh; /* XXX */ | ||
656 | channel_init_channels(ssh); | 653 | channel_init_channels(ssh); |
657 | 654 | ||
658 | /* Parse command-line arguments. */ | 655 | /* Parse command-line arguments. */ |