Debian release 3.6p1-1.

1 files changed, 15 insertions, 11 deletions

diff --git a/readconf.c b/readconf.c
index 097d4082d..c2497638f 100644
--- a/readconf.c
+++ b/readconf.c
@@ -12,7 +12,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: readconf.c,v 1.100 2002/06/19 00:27:55 deraadt Exp $");
+RCSID("$OpenBSD: readconf.c,v 1.102 2003/02/05 09:02:28 markus Exp $");
 
 #include "ssh.h"
 #include "xmalloc.h"
@@ -116,6 +116,7 @@ typedef enum {
         oDynamicForward, oPreferredAuthentications, oHostbasedAuthentication,
         oHostKeyAlgorithms, oBindAddress, oSmartcardDevice,
         oClearAllForwardings, oNoHostAuthenticationForLocalhost,
+        oEnableSSHKeysign,
         oProtocolKeepAlives, oSetupTimeOut,
         oDeprecated
 } OpCodes;
@@ -188,6 +189,7 @@ static struct {
         { "bindaddress", oBindAddress },
         { "smartcarddevice", oSmartcardDevice },
         { "clearallforwardings", oClearAllForwardings },
+        { "enablesshkeysign", oEnableSSHKeysign },
         { "nohostauthenticationforlocalhost", oNoHostAuthenticationForLocalhost },
         { "protocolkeepalives", oProtocolKeepAlives },
         { "setuptimeout", oSetupTimeOut },
@@ -271,14 +273,16 @@ parse_token(const char *cp, const char *filename, int linenum)
  * Processes a single option line as used in the configuration files. This
  * only sets those values that have not already been set.
  */
+#define WHITESPACE " \t\r\n"
 
 int
 process_config_line(Options *options, const char *host,
                     char *line, const char *filename, int linenum,
                     int *activep)
 {
-        char buf[256], *s, *string, **charptr, *endofnumber, *keyword, *arg;
+        char buf[256], *s, **charptr, *endofnumber, *keyword, *arg;
         int opcode, *intptr, value;
+        size_t len;
         u_short fwd_port, fwd_host_port;
         char sfwd_host_port[6];
 
@@ -499,16 +503,9 @@ parse_string:
 
         case oProxyCommand:
                 charptr = &options->proxy_command;
-                string = xstrdup("");
-                while ((arg = strdelim(&s)) != NULL && *arg != '\0') {
-                        string = xrealloc(string, strlen(string) + strlen(arg) + 2);
-                        strcat(string, " ");
-                        strcat(string, arg);
-                }
+                len = strspn(s, WHITESPACE "=");
                 if (*activep && *charptr == NULL)
-                        *charptr = string;
-                else
-                        xfree(string);
+                        *charptr = xstrdup(s + len);
                 return 0;
 
         case oPort:
@@ -682,6 +679,10 @@ parse_int:
                         *intptr = value;
                 break;
 
+        case oEnableSSHKeysign:
+                intptr = &options->enable_ssh_keysign;
+                goto parse_flag;
+
         case oDeprecated:
                 debug("%s line %d: Deprecated option \"%s\"",
                     filename, linenum, keyword);
@@ -807,6 +808,7 @@ initialize_options(Options * options)
         options->preferred_authentications = NULL;
         options->bind_address = NULL;
         options->smartcard_device = NULL;
+        options->enable_ssh_keysign = - 1;
         options->no_host_authentication_for_localhost = - 1;
 }
 
@@ -930,6 +932,8 @@ fill_default_options(Options * options)
                 clear_forwardings(options);
         if (options->no_host_authentication_for_localhost == - 1)
                 options->no_host_authentication_for_localhost = 0;
+        if (options->enable_ssh_keysign == -1)
+                options->enable_ssh_keysign = 0;
         /* options->proxy_command should not be set by default */
         /* options->user will be set in the main program if appropriate */
         /* options->hostname will be set in the main program if appropriate */