1 files changed, 21 insertions, 12 deletions

diff --git a/readconf.c b/readconf.c
index 2ba312441..9812b8d98 100644
--- a/readconf.c
+++ b/readconf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: readconf.c,v 1.304 2019/03/01 02:08:50 djm Exp $ */
+/* $OpenBSD: readconf.c,v 1.309 2019/09/06 14:45:34 naddy Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -87,7 +87,7 @@
      User foo
 
    Host fake.com
-     HostName another.host.name.real.org
+     Hostname another.host.name.real.org
      User blaah
      Port 34289
      ForwardX11 no
@@ -149,7 +149,7 @@ typedef enum {
         oGatewayPorts, oExitOnForwardFailure,
         oPasswordAuthentication, oRSAAuthentication,
         oChallengeResponseAuthentication, oXAuthLocation,
-        oIdentityFile, oHostName, oPort, oCipher, oRemoteForward, oLocalForward,
+        oIdentityFile, oHostname, oPort, oCipher, oRemoteForward, oLocalForward,
         oCertificateFile, oAddKeysToAgent, oIdentityAgent,
         oUser, oEscapeChar, oRhostsRSAAuthentication, oProxyCommand,
         oGlobalKnownHostsFile, oUserKnownHostsFile, oConnectionAttempts,
@@ -257,7 +257,7 @@ static struct {
         { "certificatefile", oCertificateFile },
         { "addkeystoagent", oAddKeysToAgent },
         { "identityagent", oIdentityAgent },
-        { "hostname", oHostName },
+        { "hostname", oHostname },
         { "hostkeyalias", oHostKeyAlias },
         { "proxycommand", oProxyCommand },
         { "port", oPort },
@@ -505,6 +505,11 @@ execute_in_shell(const char *cmd)
         if ((shell = getenv("SHELL")) == NULL)
                 shell = _PATH_BSHELL;
 
+        if (access(shell, X_OK) == -1) {
+                fatal("Shell \"%s\" is not executable: %s",
+                    shell, strerror(errno));
+        }
+
         /* Need this to redirect subprocess stdin/out */
         if ((devnull = open(_PATH_DEVNULL, O_RDWR)) == -1)
                 fatal("open(/dev/null): %s", strerror(errno));
@@ -537,7 +542,7 @@ execute_in_shell(const char *cmd)
                 _exit(1);
         }
         /* Parent. */
-        if (pid < 0)
+        if (pid == -1)
                 fatal("%s: fork: %.100s", __func__, strerror(errno));
 
         close(devnull);
@@ -1168,7 +1173,7 @@ parse_char_array:
                 max_entries = SSH_MAX_HOSTS_FILES;
                 goto parse_char_array;
 
-        case oHostName:
+        case oHostname:
                 charptr = &options->hostname;
                 goto parse_string;
 
@@ -1245,7 +1250,8 @@ parse_int:
                 arg = strdelim(&s);
                 if (!arg || *arg == '\0')
                         fatal("%.200s line %d: Missing argument.", filename, linenum);
-                if (*arg != '-' && !ciphers_valid(*arg == '+' ? arg + 1 : arg))
+                if (*arg != '-' &&
+                    !ciphers_valid(*arg == '+' || *arg == '^' ? arg + 1 : arg))
                         fatal("%.200s line %d: Bad SSH2 cipher spec '%s'.",
                             filename, linenum, arg ? arg : "<NONE>");
                 if (*activep && options->ciphers == NULL)
@@ -1256,8 +1262,9 @@ parse_int:
                 arg = strdelim(&s);
                 if (!arg || *arg == '\0')
                         fatal("%.200s line %d: Missing argument.", filename, linenum);
-                if (*arg != '-' && !mac_valid(*arg == '+' ? arg + 1 : arg))
-                        fatal("%.200s line %d: Bad SSH2 Mac spec '%s'.",
+                if (*arg != '-' &&
+                    !mac_valid(*arg == '+' || *arg == '^' ? arg + 1 : arg))
+                        fatal("%.200s line %d: Bad SSH2 MAC spec '%s'.",
                             filename, linenum, arg ? arg : "<NONE>");
                 if (*activep && options->macs == NULL)
                         options->macs = xstrdup(arg);
@@ -1269,7 +1276,8 @@ parse_int:
                         fatal("%.200s line %d: Missing argument.",
                             filename, linenum);
                 if (*arg != '-' &&
-                    !kex_names_valid(*arg == '+' ? arg + 1 : arg))
+                    !kex_names_valid(*arg == '+' || *arg == '^' ?
+                    arg + 1 : arg))
                         fatal("%.200s line %d: Bad SSH2 KexAlgorithms '%s'.",
                             filename, linenum, arg ? arg : "<NONE>");
                 if (*activep && options->kex_algorithms == NULL)
@@ -1284,7 +1292,8 @@ parse_keytypes:
                         fatal("%.200s line %d: Missing argument.",
                             filename, linenum);
                 if (*arg != '-' &&
-                    !sshkey_names_valid2(*arg == '+' ? arg + 1 : arg, 1))
+                    !sshkey_names_valid2(*arg == '+' || *arg == '^' ?
+                    arg + 1 : arg, 1))
                         fatal("%s line %d: Bad key types '%s'.",
                                 filename, linenum, arg ? arg : "<NONE>");
                 if (*activep && *charptr == NULL)
@@ -2666,7 +2675,7 @@ dump_client_config(Options *o, const char *host)
 
         /* Most interesting options first: user, host, port */
         dump_cfg_string(oUser, o->user);
-        dump_cfg_string(oHostName, host);
+        dump_cfg_string(oHostname, host);
         dump_cfg_int(oPort, o->port);
 
         /* Flag options */