diff options
| author | Damien Miller <djm@cvs.openbsd.org> | 2010-07-02 04:32:45 +0000 |
|---|---|---|
| committer | Damien Miller <djm@cvs.openbsd.org> | 2010-07-02 04:32:45 +0000 |
| commit | e1c381042d06c10cd761be8f99e5d7dbbbd8437c (patch) | |
| tree | 5b6f409b97fbf7531e53a9210df2749ee23e8ec5 /usr.bin/ssh/misc.c | |
| parent | db7ccadcd7f13445144bbbdc0a2ec5cc440b72f0 (diff) | |
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;
Diffstat (limited to 'usr.bin/ssh/misc.c')
| -rw-r--r-- | usr.bin/ssh/misc.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/usr.bin/ssh/misc.c b/usr.bin/ssh/misc.c index 11ee7f16674..46a66126a1e 100644 --- a/usr.bin/ssh/misc.c +++ b/usr.bin/ssh/misc.c @@ -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. @@ -171,6 +171,7 @@ strdelim(char **s) return (NULL); /* no matching quote */ } else { *s[0] = '\0'; + *s += strspn(*s + 1, WHITESPACE) + 1; return (old); } } |