Module Name: src Committed By: christos Date: Sat May 16 14:17:28 UTC 2015
Modified Files: src/crypto/external/bsd/openssh/dist: compat.c Log Message: Pass the correct length to match_patter_list; from Hanno Boeck. XXX: pullup-7 To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 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.9 src/crypto/external/bsd/openssh/dist/compat.c:1.10 --- src/crypto/external/bsd/openssh/dist/compat.c:1.9 Fri Apr 3 19:58:19 2015 +++ src/crypto/external/bsd/openssh/dist/compat.c Sat May 16 10:17:28 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: compat.c,v 1.9 2015/04/03 23:58:19 christos Exp $ */ +/* $NetBSD: compat.c,v 1.10 2015/05/16 14:17:28 christos 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.9 2015/04/03 23:58:19 christos Exp $"); +__RCSID("$NetBSD: compat.c,v 1.10 2015/05/16 14:17:28 christos 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));