Import openssh_6.7p1.orig.tar.gz

1 files changed, 9 insertions, 8 deletions

diff --git a/auth-options.c b/auth-options.c
index fa209eaab..f3d9c9df8 100644
--- a/auth-options.c
+++ b/auth-options.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: auth-options.c,v 1.62 2013/12/19 00:27:57 djm Exp $ */
+/* $OpenBSD: auth-options.c,v 1.64 2014/07/15 15:54:14 millert Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -26,9 +26,9 @@
 #include "log.h"
 #include "canohost.h"
 #include "buffer.h"
+#include "misc.h"
 #include "channels.h"
 #include "servconf.h"
-#include "misc.h"
 #include "key.h"
 #include "auth-options.h"
 #include "hostfile.h"
@@ -325,6 +325,7 @@ auth_parse_options(struct passwd *pw, char *opts, char *file, u_long linenum)
                         patterns[i] = '\0';
                         opts++;
                         p = patterns;
+                        /* XXX - add streamlocal support */
                         host = hpdelim(&p);
                         if (host == NULL || strlen(host) >= NI_MAXHOST) {
                                 debug("%.100s, line %lu: Bad permitopen "
@@ -586,8 +587,8 @@ auth_cert_options(Key *k, struct passwd *pw)
 
         if (key_cert_is_legacy(k)) {
                 /* All options are in the one field for v00 certs */
-                if (parse_option_list(buffer_ptr(&k->cert->critical),
-                    buffer_len(&k->cert->critical), pw,
+                if (parse_option_list(buffer_ptr(k->cert->critical),
+                    buffer_len(k->cert->critical), pw,
                     OPTIONS_CRITICAL|OPTIONS_EXTENSIONS, 1,
                     &cert_no_port_forwarding_flag,
                     &cert_no_agent_forwarding_flag,
@@ -599,14 +600,14 @@ auth_cert_options(Key *k, struct passwd *pw)
                         return -1;
         } else {
                 /* Separate options and extensions for v01 certs */
-                if (parse_option_list(buffer_ptr(&k->cert->critical),
-                    buffer_len(&k->cert->critical), pw,
+                if (parse_option_list(buffer_ptr(k->cert->critical),
+                    buffer_len(k->cert->critical), pw,
                     OPTIONS_CRITICAL, 1, NULL, NULL, NULL, NULL, NULL,
                     &cert_forced_command,
                     &cert_source_address_done) == -1)
                         return -1;
-                if (parse_option_list(buffer_ptr(&k->cert->extensions),
-                    buffer_len(&k->cert->extensions), pw,
+                if (parse_option_list(buffer_ptr(k->cert->extensions),
+                    buffer_len(k->cert->extensions), pw,
                     OPTIONS_EXTENSIONS, 1,
                     &cert_no_port_forwarding_flag,
                     &cert_no_agent_forwarding_flag,