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