Module Name: src
Committed By: snj
Date: Sat May 16 18:05:07 UTC 2015
Modified Files:
src/crypto/external/bsd/openssh/dist [netbsd-7]: compat.c
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.6.4.1 -r1.6.4.2 \
src/crypto/external/bsd/openssh/dist/compat.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/openssh/dist/compat.c
diff -u src/crypto/external/bsd/openssh/dist/compat.c:1.6.4.1 src/crypto/external/bsd/openssh/dist/compat.c:1.6.4.2
--- src/crypto/external/bsd/openssh/dist/compat.c:1.6.4.1 Thu Apr 30 06:07:30 2015
+++ src/crypto/external/bsd/openssh/dist/compat.c Sat May 16 18:05:06 2015
@@ -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 @@ filter_proposal(const char *proposal, co
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));
