summaryrefslogtreecommitdiff
path: root/misc.c
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2010-07-16 13:56:01 +1000
committerDamien Miller <djm@mindrot.org>2010-07-16 13:56:01 +1000
commit9308fc7743d485f7ddf6dfd7c2e222588f7623df (patch)
tree44f0299c7f7e8894a54e7bff6af13626167bd8a3 /misc.c
parentcfbdc28ffe06de99d582ddff43f9f0be7dccc608 (diff)
- 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;
Diffstat (limited to 'misc.c')
-rw-r--r--misc.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/misc.c b/misc.c
index b19ece836..4500b7a37 100644
--- a/misc.c
+++ b/misc.c
@@ -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 }