summaryrefslogtreecommitdiff
path: root/usr.bin/ssh/sshd.c
diff options
context:
space:
mode:
authorDamien Miller <djm@cvs.openbsd.org>2019-01-17 01:50:25 +0000
committerDamien Miller <djm@cvs.openbsd.org>2019-01-17 01:50:25 +0000
commit6e2445153f55025d4837aeadc5f1ad4e1094d203 (patch)
tree76c723a55d4d71b2e16ead0d68f98c6fe8034a18 /usr.bin/ssh/sshd.c
parent19dc333eea9963be141db29c5c0dbc783f7a0ecd (diff)
many of the global variables in this file can be made static;
patch from Markus Schmidt
Diffstat (limited to 'usr.bin/ssh/sshd.c')
-rw-r--r--usr.bin/ssh/sshd.c30
1 files changed, 15 insertions, 15 deletions
diff --git a/usr.bin/ssh/sshd.c b/usr.bin/ssh/sshd.c
index 7ae2944369b..809251f11d7 100644
--- a/usr.bin/ssh/sshd.c
+++ b/usr.bin/ssh/sshd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshd.c,v 1.520 2018/12/27 03:25:25 djm Exp $ */
+/* $OpenBSD: sshd.c,v 1.521 2019/01/17 01:50:24 djm Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -133,37 +133,37 @@ int debug_flag = 0;
* configuration, optionally using connection information provided by the
* "-C" flag.
*/
-int test_flag = 0;
+static int test_flag = 0;
/* Flag indicating that the daemon is being started from inetd. */
-int inetd_flag = 0;
+static int inetd_flag = 0;
/* Flag indicating that sshd should not detach and become a daemon. */
-int no_daemon_flag = 0;
+static int no_daemon_flag = 0;
/* debug goes to stderr unless inetd_flag is set */
-int log_stderr = 0;
+static int log_stderr = 0;
/* Saved arguments to main(). */
-char **saved_argv;
+static char **saved_argv;
/* re-exec */
-int rexeced_flag = 0;
-int rexec_flag = 1;
-int rexec_argc = 0;
-char **rexec_argv;
+static int rexeced_flag = 0;
+static int rexec_flag = 1;
+static int rexec_argc = 0;
+static char **rexec_argv;
/*
* The sockets that the server is listening; this is used in the SIGHUP
* signal handler.
*/
#define MAX_LISTEN_SOCKS 16
-int listen_socks[MAX_LISTEN_SOCKS];
-int num_listen_socks = 0;
+static int listen_socks[MAX_LISTEN_SOCKS];
+static int num_listen_socks = 0;
/* Daemon's agent connection */
int auth_sock = -1;
-int have_agent = 0;
+static int have_agent = 0;
/*
* Any really sensitive data in the application is contained in this
@@ -195,8 +195,8 @@ u_int session_id2_len = 0;
u_int utmp_len = HOST_NAME_MAX+1;
/* options.max_startup sized array of fd ints */
-int *startup_pipes = NULL;
-int startup_pipe; /* in child */
+static int *startup_pipes = NULL;
+static int startup_pipe; /* in child */
/* variables used for privilege separation */
int use_privsep = -1;