diff options
| author | Markus Friedl <markus@cvs.openbsd.org> | 2001-01-19 15:55:13 +0000 |
|---|---|---|
| committer | Markus Friedl <markus@cvs.openbsd.org> | 2001-01-19 15:55:13 +0000 |
| commit | c8e30de90fc429e1ff3ad41ca71e4dccd8d82cc0 (patch) | |
| tree | 399702fc4973938c6f47bff5cbe9674747e43db0 /usr.bin/ssh/sshd.c | |
| parent | 89ca1809e467b574468e1fd98161130448eecf10 (diff) | |
move ssh1 definitions to ssh1.h, pathnames to pathnames.h
Diffstat (limited to 'usr.bin/ssh/sshd.c')
| -rw-r--r-- | usr.bin/ssh/sshd.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/usr.bin/ssh/sshd.c b/usr.bin/ssh/sshd.c index 41df30d5ea0..9148f0f7af7 100644 --- a/usr.bin/ssh/sshd.c +++ b/usr.bin/ssh/sshd.c @@ -40,7 +40,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: sshd.c,v 1.153 2001/01/19 12:45:27 markus Exp $"); +RCSID("$OpenBSD: sshd.c,v 1.154 2001/01/19 15:55:12 markus Exp $"); #include "xmalloc.h" #include "rsa.h" @@ -53,6 +53,7 @@ RCSID("$OpenBSD: sshd.c,v 1.153 2001/01/19 12:45:27 markus Exp $"); #include "compat.h" #include "buffer.h" +#include "ssh1.h" #include "ssh2.h" #include <openssl/dh.h> #include <openssl/bn.h> @@ -66,6 +67,7 @@ RCSID("$OpenBSD: sshd.c,v 1.153 2001/01/19 12:45:27 markus Exp $"); #include "auth.h" #include "myproposal.h" #include "authfile.h" +#include "pathnames.h" #ifdef LIBWRAP #include <tcpd.h> @@ -84,7 +86,7 @@ extern char *__progname; ServerOptions options; /* Name of the server configuration file. */ -char *config_file_name = SERVER_CONFIG_FILE; +char *config_file_name = _PATH_SERVER_CONFIG_FILE; /* * Flag indicating whether IPv4 or IPv6. This can be set on the command line. @@ -630,7 +632,7 @@ main(int ac, char **av) fprintf(stderr, "sshd version %s\n", SSH_VERSION); fprintf(stderr, "Usage: %s [options]\n", __progname); fprintf(stderr, "Options:\n"); - fprintf(stderr, " -f file Configuration file (default %s)\n", SERVER_CONFIG_FILE); + fprintf(stderr, " -f file Configuration file (default %s)\n", _PATH_SERVER_CONFIG_FILE); fprintf(stderr, " -d Debugging mode (multiple -d means more debugging)\n"); fprintf(stderr, " -i Started from inetd\n"); fprintf(stderr, " -D Do not fork into daemon mode\n"); @@ -640,7 +642,7 @@ main(int ac, char **av) fprintf(stderr, " -g seconds Grace period for authentication (default: 600)\n"); fprintf(stderr, " -b bits Size of server RSA key (default: 768 bits)\n"); fprintf(stderr, " -h file File from which to read host key (default: %s)\n", - HOST_KEY_FILE); + _PATH_HOST_KEY_FILE); fprintf(stderr, " -u len Maximum hostname length for utmp recording\n"); fprintf(stderr, " -4 Use IPv4 only\n"); fprintf(stderr, " -6 Use IPv6 only\n"); |