1 files changed, 8 insertions, 2 deletions

diff --git a/readconf.c b/readconf.c
index 9c5638b07..d7011d7f7 100644
--- a/readconf.c
+++ b/readconf.c
@@ -14,7 +14,7 @@
  */
 
 #include "includes.h"
-RCSID("$Id: readconf.c,v 1.14 2000/05/09 01:03:01 damien Exp $");
+RCSID("$Id: readconf.c,v 1.15 2000/05/30 03:44:53 damien Exp $");
 
 #include "ssh.h"
 #include "cipher.h"
@@ -464,6 +464,8 @@ parse_int:
         case oCipher:
                 intptr = &options->cipher;
                 cp = strtok(NULL, WHITESPACE);
+                if (!cp)
+                        fatal("%.200s line %d: Missing argument.", filename, linenum);
                 value = cipher_number(cp);
                 if (value == -1)
                         fatal("%.200s line %d: Bad cipher '%s'.",
@@ -474,6 +476,8 @@ parse_int:
 
         case oCiphers:
                 cp = strtok(NULL, WHITESPACE);
+                if (!cp)
+                        fatal("%.200s line %d: Missing argument.", filename, linenum);
                 if (!ciphers_valid(cp))
                         fatal("%.200s line %d: Bad SSH2 cipher spec '%s'.",
                               filename, linenum, cp ? cp : "<NONE>");
@@ -484,6 +488,8 @@ parse_int:
         case oProtocol:
                 intptr = &options->protocol;
                 cp = strtok(NULL, WHITESPACE);
+                if (!cp)
+                        fatal("%.200s line %d: Missing argument.", filename, linenum);
                 value = proto_spec(cp);
                 if (value == SSH_PROTO_UNKNOWN)
                         fatal("%.200s line %d: Bad protocol spec '%s'.",
@@ -691,7 +697,7 @@ void
 fill_default_options(Options * options)
 {
         if (options->forward_agent == -1)
-                options->forward_agent = 1;
+                options->forward_agent = 0;
         if (options->forward_x11 == -1)
                 options->forward_x11 = 0;
         if (options->gateway_ports == -1)