diff options
-rw-r--r-- | sshd.c | 32 |
1 files changed, 16 insertions, 16 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: sshd.c,v 1.520 2018/12/27 03:25:25 djm Exp $ */ | 1 | /* $OpenBSD: sshd.c,v 1.521 2019/01/17 01:50:24 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 |
@@ -151,38 +151,38 @@ int debug_flag = 0; | |||
151 | * configuration, optionally using connection information provided by the | 151 | * configuration, optionally using connection information provided by the |
152 | * "-C" flag. | 152 | * "-C" flag. |
153 | */ | 153 | */ |
154 | int test_flag = 0; | 154 | static int test_flag = 0; |
155 | 155 | ||
156 | /* Flag indicating that the daemon is being started from inetd. */ | 156 | /* Flag indicating that the daemon is being started from inetd. */ |
157 | int inetd_flag = 0; | 157 | static int inetd_flag = 0; |
158 | 158 | ||
159 | /* Flag indicating that sshd should not detach and become a daemon. */ | 159 | /* Flag indicating that sshd should not detach and become a daemon. */ |
160 | int no_daemon_flag = 0; | 160 | static int no_daemon_flag = 0; |
161 | 161 | ||
162 | /* debug goes to stderr unless inetd_flag is set */ | 162 | /* debug goes to stderr unless inetd_flag is set */ |
163 | int log_stderr = 0; | 163 | static int log_stderr = 0; |
164 | 164 | ||
165 | /* Saved arguments to main(). */ | 165 | /* Saved arguments to main(). */ |
166 | char **saved_argv; | 166 | static char **saved_argv; |
167 | int saved_argc; | 167 | static int saved_argc; |
168 | 168 | ||
169 | /* re-exec */ | 169 | /* re-exec */ |
170 | int rexeced_flag = 0; | 170 | static int rexeced_flag = 0; |
171 | int rexec_flag = 1; | 171 | static int rexec_flag = 1; |
172 | int rexec_argc = 0; | 172 | static int rexec_argc = 0; |
173 | char **rexec_argv; | 173 | static char **rexec_argv; |
174 | 174 | ||
175 | /* | 175 | /* |
176 | * The sockets that the server is listening; this is used in the SIGHUP | 176 | * The sockets that the server is listening; this is used in the SIGHUP |
177 | * signal handler. | 177 | * signal handler. |
178 | */ | 178 | */ |
179 | #define MAX_LISTEN_SOCKS 16 | 179 | #define MAX_LISTEN_SOCKS 16 |
180 | int listen_socks[MAX_LISTEN_SOCKS]; | 180 | static int listen_socks[MAX_LISTEN_SOCKS]; |
181 | int num_listen_socks = 0; | 181 | static int num_listen_socks = 0; |
182 | 182 | ||
183 | /* Daemon's agent connection */ | 183 | /* Daemon's agent connection */ |
184 | int auth_sock = -1; | 184 | int auth_sock = -1; |
185 | int have_agent = 0; | 185 | static int have_agent = 0; |
186 | 186 | ||
187 | /* | 187 | /* |
188 | * Any really sensitive data in the application is contained in this | 188 | * Any really sensitive data in the application is contained in this |
@@ -214,8 +214,8 @@ u_int session_id2_len = 0; | |||
214 | u_int utmp_len = HOST_NAME_MAX+1; | 214 | u_int utmp_len = HOST_NAME_MAX+1; |
215 | 215 | ||
216 | /* options.max_startup sized array of fd ints */ | 216 | /* options.max_startup sized array of fd ints */ |
217 | int *startup_pipes = NULL; | 217 | static int *startup_pipes = NULL; |
218 | int startup_pipe; /* in child */ | 218 | static int startup_pipe; /* in child */ |
219 | 219 | ||
220 | /* variables used for privilege separation */ | 220 | /* variables used for privilege separation */ |
221 | int use_privsep = -1; | 221 | int use_privsep = -1; |