- dtucker@cvs.openbsd.org 2013/02/22 04:45:09

     [ssh.c readconf.c readconf.h]
     Don't complain if IdentityFiles specified in system-wide configs are
     missing.  ok djm, deraadt

1 files changed, 6 insertions, 4 deletions

diff --git a/ssh.c b/ssh.c
index 8a7aea09f..5d3f492f0 100644
--- a/ssh.c
+++ b/ssh.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh.c,v 1.371 2013/02/17 23:16:57 dtucker Exp $ */
+/* $OpenBSD: ssh.c,v 1.372 2013/02/22 04:45:09 dtucker Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -579,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;
@@ -673,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,