[src/netbsd-7]: src/crypto/external/bsd/openssh/dist Pull up following revisi...

[snj <snj%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/4cfaa5f5c26f
branches:  netbsd-7
changeset: 799343:4cfaa5f5c26f
user:      snj <snj%NetBSD.org@localhost>
date:      Sat May 16 18:05:06 2015 +0000

description:
Pull up following revision(s) (requested by christos in ticket #783):
        crypto/external/bsd/openssh/dist/compat.c: revision 1.10
Pass the correct length to match_patter_list; from Hanno Boeck.

diffstat:

 crypto/external/bsd/openssh/dist/compat.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r be1c3296edc6 -r 4cfaa5f5c26f crypto/external/bsd/openssh/dist/compat.c
--- a/crypto/external/bsd/openssh/dist/compat.c Sat May 16 18:02:14 2015 +0000
+++ b/crypto/external/bsd/openssh/dist/compat.c Sat May 16 18:05:06 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: compat.c,v 1.6.4.1 2015/04/30 06:07:30 riz Exp $       */
+/*     $NetBSD: compat.c,v 1.6.4.2 2015/05/16 18:05:06 snj Exp $       */
 /* $OpenBSD: compat.c,v 1.87 2015/01/19 20:20:20 markus Exp $ */
 /*
  * Copyright (c) 1999, 2000, 2001, 2002 Markus Friedl.  All rights reserved.
@@ -25,7 +25,7 @@
  */
 
 #include "includes.h"
-__RCSID("$NetBSD: compat.c,v 1.6.4.1 2015/04/30 06:07:30 riz Exp $");
+__RCSID("$NetBSD: compat.c,v 1.6.4.2 2015/05/16 18:05:06 snj Exp $");
 #include <sys/types.h>
 
 #include <stdlib.h>
@@ -242,7 +242,7 @@
        buffer_init(&b);
        tmp = orig_prop = xstrdup(proposal);
        while ((cp = strsep(&tmp, ",")) != NULL) {
-               if (match_pattern_list(cp, filter, strlen(cp), 0) != 1) {
+               if (match_pattern_list(cp, filter, strlen(filter), 0) != 1) {
                        if (buffer_len(&b) > 0)
                                buffer_append(&b, ",", 1);
                        buffer_append(&b, cp, strlen(cp));