diff options
-rw-r--r-- | ChangeLog | 9 | ||||
-rw-r--r-- | misc.c | 3 |
2 files changed, 11 insertions, 1 deletions
@@ -1,3 +1,12 @@ +20100716 + - (djm) OpenBSD CVS Sync + - djm@cvs.openbsd.org 2010/07/02 04:32:44 + [misc.c] + unbreak strdelim() skipping past quoted strings, e.g. + AllowUsers "blah blah" blah + was broken; report and fix in bz#1757 from bitman.zhou AT centrify.com + ok dtucker; + 20100714 - (tim) [contrib/redhat/openssh.spec] Bug 1796: Test for skip_x11_askpass (line 77) should have been for no_x11_askpass. @@ -1,4 +1,4 @@ -/* $OpenBSD: misc.c,v 1.76 2010/05/21 05:00:36 djm Exp $ */ +/* $OpenBSD: misc.c,v 1.77 2010/07/02 04:32:44 djm Exp $ */ /* * Copyright (c) 2000 Markus Friedl. All rights reserved. * Copyright (c) 2005,2006 Damien Miller. All rights reserved. @@ -178,6 +178,7 @@ strdelim(char **s) return (NULL); /* no matching quote */ } else { *s[0] = '\0'; + *s += strspn(*s + 1, WHITESPACE) + 1; return (old); } } |