- markus@cvs.openbsd.org 2001/02/11 12:59:25

[openssh.git] / ssh.c

diff --git a/ssh.c b/ssh.c
index 4ca1e7bf879f585c09d7189c62d8f5336fc093ba..1b022402d38b7b634f555877606b2ca0eb979f88 100644 (file)
--- a/ssh.c
+++ b/ssh.c
@@ -39,7 +39,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: ssh.c,v 1.94 2001/02/10 01:46:28 markus Exp $");
+RCSID("$OpenBSD: ssh.c,v 1.95 2001/02/11 12:59:25 markus Exp $");
 
 #include <openssl/evp.h>
 #include <openssl/err.h>
@@ -65,6 +65,8 @@ RCSID("$OpenBSD: ssh.c,v 1.94 2001/02/10 01:46:28 markus Exp $");
 #include "tildexpand.h"
 #include "dispatch.h"
 #include "misc.h"
+#include "kex.h"
+#include "mac.h"
 
 #ifdef HAVE___PROGNAME
 extern char *__progname;
@@ -305,7 +307,7 @@ main(int ac, char **av)
                opt = av[optind][1];
                if (!opt)
                        usage();
-               if (strchr("eilcpLRo", opt)) {  /* options with arguments */
+               if (strchr("eilcmpLRo", opt)) { /* options with arguments */
                        optarg = av[optind] + 2;
                        if (strcmp(optarg, "") == 0) {
                                if (optind >= ac - 1)
@@ -434,6 +436,14 @@ main(int ac, char **av)
                                }
                        }
                        break;
+               case 'm':
+                       if (mac_valid(optarg))
+                               options.macs = xstrdup(optarg);
+                       else {
+                               fprintf(stderr, "Unknown mac type '%s'\n", optarg);
+                               exit(1);
+                       }
+                       break;
                case 'p':
                        options.port = atoi(optarg);
                        break;