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

[openssh.git] / servconf.c

diff --git a/servconf.c b/servconf.c
index 801267b4853218665028739dbd99780b7f16b483..7dfd040c81ad5966913583a7dae3513da42b1bef 100644 (file)
--- a/servconf.c
+++ b/servconf.c
@@ -10,16 +10,32 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: servconf.c,v 1.59 2001/01/19 12:45:26 markus Exp $");
+RCSID("$OpenBSD: servconf.c,v 1.62 2001/01/21 19:05:55 markus Exp $");
+
+#ifdef KRB4
+#include <krb.h>
+#endif
+#ifdef AFS
+#include <kafs.h>
+#endif
 
 #include "ssh.h"
+#include "log.h"
 #include "servconf.h"
 #include "xmalloc.h"
 #include "compat.h"
+#include "pathnames.h"
+#include "tildexpand.h"
+#include "misc.h"
+#include "cipher.h"
+
 
 /* add listen address */
 void add_listen_addr(ServerOptions *options, char *addr);
 
+/* AF_UNSPEC or AF_INET or AF_INET6 */
+extern int IPv4or6;
+
 /* Initializes the server options to their default values. */
 
 void
@@ -87,16 +103,16 @@ fill_default_server_options(ServerOptions *options)
        if (options->num_host_key_files == 0) {
                /* fill default hostkeys for protocols */
                if (options->protocol & SSH_PROTO_1)
-                       options->host_key_files[options->num_host_key_files++] = HOST_KEY_FILE;
+                       options->host_key_files[options->num_host_key_files++] = _PATH_HOST_KEY_FILE;
                if (options->protocol & SSH_PROTO_2)
-                       options->host_key_files[options->num_host_key_files++] = HOST_DSA_KEY_FILE;
+                       options->host_key_files[options->num_host_key_files++] = _PATH_HOST_DSA_KEY_FILE;
        }
        if (options->num_ports == 0)
                options->ports[options->num_ports++] = SSH_DEFAULT_PORT;
        if (options->listen_addrs == NULL)
                add_listen_addr(options, NULL);
        if (options->pid_file == NULL)
-               options->pid_file = SSH_DAEMON_PID_FILE;
+               options->pid_file = _PATH_SSH_DAEMON_PID_FILE;
        if (options->server_key_bits == -1)
                options->server_key_bits = 768;
        if (options->login_grace_time == -1)
@@ -281,7 +297,6 @@ parse_token(const char *cp, const char *filename,
 void
 add_listen_addr(ServerOptions *options, char *addr)
 {
-       extern int IPv4or6;
        struct addrinfo hints, *ai, *aitop;
        char strport[NI_MAXSERV];
        int gaierr;
@@ -332,7 +347,7 @@ read_server_config(ServerOptions *options, const char *filename)
                /* Ignore leading whitespace */
                if (*arg == '\0')
                        arg = strdelim(&cp);
-               if (!*arg || *arg == '#')
+               if (!arg || !*arg || *arg == '#')
                        continue;
                intptr = NULL;
                charptr = NULL;