tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- 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;
This commit is contained in:
Damien Miller 2010-07-16 13:56:01 +10:00
parent cfbdc28ffe
commit 9308fc7743
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -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 20100714
- (tim) [contrib/redhat/openssh.spec] Bug 1796: Test for skip_x11_askpass - (tim) [contrib/redhat/openssh.spec] Bug 1796: Test for skip_x11_askpass
(line 77) should have been for no_x11_askpass. (line 77) should have been for no_x11_askpass.

3
misc.c
View File

@ -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) 2000 Markus Friedl. All rights reserved.
* Copyright (c) 2005,2006 Damien Miller. All rights reserved. * Copyright (c) 2005,2006 Damien Miller. All rights reserved.
@ -178,6 +178,7 @@ strdelim(char **s)
return (NULL); /* no matching quote */ return (NULL); /* no matching quote */
} else { } else {
*s[0] = '\0'; *s[0] = '\0';
*s += strspn(*s + 1, WHITESPACE) + 1;
return (old); return (old);
} }
} }