Hopefully things did not get mixed around too much. It compiles under

[openssh.git] / ssh.c

diff --git a/ssh.c b/ssh.c
index f1beb8c533d8153dca6e37e0045c38c37d66ae1e..9f9055a5f289d710e9d13720e944ed9813e6c06b 100644 (file)
--- a/ssh.c
+++ b/ssh.c
@@ -39,27 +39,31 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: ssh.c,v 1.82 2001/01/15 21:40:10 markus Exp $");
+RCSID("$OpenBSD: ssh.c,v 1.84 2001/01/21 19:05:58 markus Exp $");
 
 #include <openssl/evp.h>
-#include <openssl/dsa.h>
-#include <openssl/rsa.h>
 #include <openssl/err.h>
 
-#include "xmalloc.h"
 #include "ssh.h"
+#include "ssh1.h"
+#include "ssh2.h"
+#include "compat.h"
+#include "cipher.h"
+#include "xmalloc.h"
 #include "packet.h"
 #include "buffer.h"
-#include "readconf.h"
 #include "uidswap.h"
-
-#include "ssh2.h"
-#include "compat.h"
 #include "channels.h"
 #include "key.h"
 #include "authfd.h"
 #include "authfile.h"
+#include "pathnames.h"
 #include "clientloop.h"
+#include "log.h"
+#include "readconf.h"
+#include "sshconnect.h"
+#include "tildexpand.h"
+#include "misc.h"
 
 #ifdef HAVE___PROGNAME
 extern char *__progname;
@@ -555,11 +559,11 @@ main(int ac, char **av)
        log_init(av[0], options.log_level, SYSLOG_FACILITY_USER, 0);
 
        /* Read per-user configuration file. */
-       snprintf(buf, sizeof buf, "%.100s/%.100s", pw->pw_dir, SSH_USER_CONFFILE);
+       snprintf(buf, sizeof buf, "%.100s/%.100s", pw->pw_dir, _PATH_SSH_USER_CONFFILE);
        read_config_file(buf, host, &options);
 
        /* Read systemwide configuration file. */
-       read_config_file(HOST_CONFIG_FILE, host, &options);
+       read_config_file(_PATH_HOST_CONFIG_FILE, host, &options);
 
        /* Fill configuration defaults. */
        fill_default_options(&options);
@@ -624,7 +628,7 @@ main(int ac, char **av)
                host_private_key = RSA_new();
                k.type = KEY_RSA1;
                k.rsa = host_private_key;
-               if (load_private_key(HOST_KEY_FILE, "", &k, NULL))
+               if (load_private_key(_PATH_HOST_KEY_FILE, "", &k, NULL))
                        host_private_key_loaded = 1;
        }
        /*
@@ -648,7 +652,7 @@ main(int ac, char **av)
         * Now that we are back to our own permissions, create ~/.ssh
         * directory if it doesn\'t already exist.
         */
-       snprintf(buf, sizeof buf, "%.100s/%.100s", pw->pw_dir, SSH_USER_DIR);
+       snprintf(buf, sizeof buf, "%.100s/%.100s", pw->pw_dir, _PATH_SSH_USER_DIR);
        if (stat(buf, &st) < 0)
                if (mkdir(buf, 0700) < 0)
                        error("Could not create directory '%.200s'.", buf);