- (tim) [configure.ac] Move CHECK_HEADERS test before platform specific

[openssh.git] / ssh.c

diff --git a/ssh.c b/ssh.c
index 2e0ef2f9fde4c87a8f67cce520848085cae945af..efc4af6d436830be00ee8e8ac5c25628e9217665 100644 (file)
--- a/ssh.c
+++ b/ssh.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh.c,v 1.283 2006/07/11 18:50:48 markus Exp $ */
+/* $OpenBSD: ssh.c,v 1.293 2006/08/03 03:34:42 deraadt Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -52,25 +52,35 @@
 #include <sys/un.h>
 
 #include <ctype.h>
+#include <errno.h>
 #include <fcntl.h>
+#include <netdb.h>
 #ifdef HAVE_PATHS_H
 #include <paths.h>
 #endif
 #include <pwd.h>
 #include <signal.h>
+#include <stdarg.h>
+#include <stddef.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#include <netinet/in.h>
+#include <arpa/inet.h>
 
 #include <openssl/evp.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 "bufaux.h"
 #include "channels.h"
 #include "key.h"
 #include "authfd.h"
@@ -1222,7 +1232,7 @@ load_public_identity_files(void)
 
        if (options.smartcard_device != NULL &&
            options.num_identity_files < SSH_MAX_IDENTITY_FILES &&
-           (keys = sc_get_keys(options.smartcard_device, NULL)) != NULL ) {
+           (keys = sc_get_keys(options.smartcard_device, NULL)) != NULL) {
                int count = 0;
                for (i = 0; keys[i] != NULL; i++) {
                        count++;
@@ -1249,7 +1259,7 @@ load_public_identity_files(void)
                cp = tilde_expand_filename(options.identity_files[i],
                    original_real_uid);
                filename = percent_expand(cp, "d", pw->pw_dir,
-                   "u", pw->pw_name, "l", thishost, "h", host, 
+                   "u", pw->pw_name, "l", thishost, "h", host,
                    "r", options.user, (char *)NULL);
                xfree(cp);
                public = key_load_public(filename, NULL);
@@ -1282,7 +1292,7 @@ env_permitted(char *env)
 
        if ((cp = strchr(env, '=')) == NULL || cp == env)
                return (0);
-       ret = snprintf(name, sizeof(name), "%.*s", (cp - env), env);
+       ret = snprintf(name, sizeof(name), "%.*s", (int)(cp - env), env);
        if (ret <= 0 || (size_t)ret >= sizeof(name))
                fatal("env_permitted: name '%.100s...' too long", env);