1 files changed, 9 insertions, 11 deletions

diff --git a/ssh.c b/ssh.c
index 58c04f88f..19732cb4d 100644
--- a/ssh.c
+++ b/ssh.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh.c,v 1.370 2012/07/06 01:47:38 djm Exp $ */
+/* $OpenBSD: ssh.c,v 1.373 2013/02/22 22:09:01 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -405,12 +405,7 @@ main(int ac, char **av)
                                     strerror(errno));
                                 break;
                         }
-                        if (options.num_identity_files >=
-                            SSH_MAX_IDENTITY_FILES)
-                                fatal("Too many identity files specified "
-                                    "(max %d)", SSH_MAX_IDENTITY_FILES);
-                        options.identity_files[options.num_identity_files++] =
-                            xstrdup(optarg);
+                        add_identity_file(&options, NULL, optarg, 1);
                         break;
                 case 'I':
 #ifdef ENABLE_PKCS11
@@ -584,7 +579,8 @@ main(int ac, char **av)
                         dummy = 1;
                         line = xstrdup(optarg);
                         if (process_config_line(&options, host ? host : "",
-                            line, "command-line", 0, &dummy) != 0)
+                            line, "command-line", 0, &dummy, SSHCONF_USERCONF)
+                            != 0)
                                 exit(255);
                         xfree(line);
                         break;
@@ -678,14 +674,15 @@ main(int ac, char **av)
          * file if the user specifies a config file on the command line.
          */
         if (config != NULL) {
-                if (!read_config_file(config, host, &options, 0))
+                if (!read_config_file(config, host, &options, SSHCONF_USERCONF))
                         fatal("Can't open user config file %.100s: "
                             "%.100s", config, strerror(errno));
         } else {
                 r = snprintf(buf, sizeof buf, "%s/%s", pw->pw_dir,
                     _PATH_SSH_USER_CONFFILE);
                 if (r > 0 && (size_t)r < sizeof(buf))
-                        (void)read_config_file(buf, host, &options, 1);
+                        (void)read_config_file(buf, host, &options,
+                             SSHCONF_CHECKPERM|SSHCONF_USERCONF);
 
                 /* Read systemwide configuration file after user config. */
                 (void)read_config_file(_PATH_HOST_CONFIG_FILE, host,
@@ -1539,7 +1536,8 @@ load_public_identity_files(void)
                 fatal("load_public_identity_files: gethostname: %s",
                     strerror(errno));
         for (i = 0; i < options.num_identity_files; i++) {
-                if (n_ids >= SSH_MAX_IDENTITY_FILES) {
+                if (n_ids >= SSH_MAX_IDENTITY_FILES ||
+                    strcasecmp(options.identity_files[i], "none") == 0) {
                         xfree(options.identity_files[i]);
                         continue;
                 }