Merge 3.9p1 to the trunk.

1 files changed, 44 insertions, 4 deletions

diff --git a/readconf.c b/readconf.c
index 2b8ff58d6..aca5b8eff 100644
--- a/readconf.c
+++ b/readconf.c
@@ -12,7 +12,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: readconf.c,v 1.128 2004/03/05 10:53:58 markus Exp $");
+RCSID("$OpenBSD: readconf.c,v 1.134 2004/07/11 17:48:47 deraadt Exp $");
 
 #include "ssh.h"
 #include "xmalloc.h"
@@ -106,6 +106,7 @@ typedef enum {
         oEnableSSHKeysign, oRekeyLimit, oVerifyHostKeyDNS, oConnectTimeout,
         oAddressFamily, oGssAuthentication, oGssDelegateCreds,
         oServerAliveInterval, oServerAliveCountMax, oIdentitiesOnly,
+        oSendEnv, oControlPath, oControlMaster,
         oProtocolKeepAlives, oSetupTimeOut,
         oDeprecated, oUnsupported
 } OpCodes;
@@ -194,6 +195,9 @@ static struct {
         { "addressfamily", oAddressFamily },
         { "serveraliveinterval", oServerAliveInterval },
         { "serveralivecountmax", oServerAliveCountMax },
+        { "sendenv", oSendEnv },
+        { "controlpath", oControlPath },
+        { "controlmaster", oControlMaster },
         { "protocolkeepalives", oProtocolKeepAlives },
         { "setuptimeout", oSetupTimeOut },
         { NULL, oBadOption }
@@ -753,6 +757,27 @@ parse_int:
                 intptr = &options->server_alive_count_max;
                 goto parse_int;
 
+        case oSendEnv:
+                while ((arg = strdelim(&s)) != NULL && *arg != '\0') {
+                        if (strchr(arg, '=') != NULL)
+                                fatal("%s line %d: Invalid environment name.",
+                                    filename, linenum);
+                        if (options->num_send_env >= MAX_SEND_ENV)
+                                fatal("%s line %d: too many send env.",
+                                    filename, linenum);
+                        options->send_env[options->num_send_env++] =
+                            xstrdup(arg);
+                }
+                break;
+
+        case oControlPath:
+                charptr = &options->control_path;
+                goto parse_string;
+
+        case oControlMaster:
+                intptr = &options->control_master;
+                goto parse_yesnoask;
+
         case oSetupTimeOut:
                 intptr = &options->setuptimeout;
                 goto parse_int;
@@ -787,7 +812,8 @@ parse_int:
  */
 
 int
-read_config_file(const char *filename, const char *host, Options *options)
+read_config_file(const char *filename, const char *host, Options *options,
+    int checkperm)
 {
         FILE *f;
         char line[1024];
@@ -795,10 +821,19 @@ read_config_file(const char *filename, const char *host, Options *options)
         int bad_options = 0;
 
         /* Open the file. */
-        f = fopen(filename, "r");
-        if (!f)
+        if ((f = fopen(filename, "r")) == NULL)
                 return 0;
 
+        if (checkperm) {
+                struct stat sb;
+
+                if (fstat(fileno(f), &sb) == -1)
+                        fatal("fstat %s: %s", filename, strerror(errno));
+                if (((sb.st_uid != 0 && sb.st_uid != getuid()) ||
+                    (sb.st_mode & 022) != 0))
+                        fatal("Bad owner or permissions on %s", filename);
+        }
+
         debug("Reading configuration data %.200s", filename);
 
         /*
@@ -888,6 +923,9 @@ initialize_options(Options * options)
         options->verify_host_key_dns = -1;
         options->server_alive_interval = -1;
         options->server_alive_count_max = -1;
+        options->num_send_env = 0;
+        options->control_path = NULL;
+        options->control_master = -1;
 }
 
 /*
@@ -1013,6 +1051,8 @@ fill_default_options(Options * options)
         }
         if (options->server_alive_count_max == -1)
                 options->server_alive_count_max = 3;
+        if (options->control_master == -1)
+                options->control_master = 0;
         if (options->setuptimeout == -1) {
                 /* in batch mode, default is 5mins */
                 if (options->batch_mode == 1)