summaryrefslogtreecommitdiffstats
path: root/libexec/ftpd
diff options
context:
space:
mode:
authoryar <yar@FreeBSD.org>2003-01-27 14:41:08 +0000
committeryar <yar@FreeBSD.org>2003-01-27 14:41:08 +0000
commit704ec7b02ab563f90df1b78cf2866c31a60c5e2a (patch)
treedc491258ca75ed275d0c557bf7b1e3466dd6e4f3 /libexec/ftpd
parentc11acfe3b72782410b60a41516dfc523014a8b0d (diff)
downloadFreeBSD-src-704ec7b02ab563f90df1b78cf2866c31a60c5e2a.zip
FreeBSD-src-704ec7b02ab563f90df1b78cf2866c31a60c5e2a.tar.gz
Allow more than one separator character between fields in ftpchroot(5).
Diffstat (limited to 'libexec/ftpd')
-rw-r--r--libexec/ftpd/ftpd.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/libexec/ftpd/ftpd.c b/libexec/ftpd/ftpd.c
index 71fca60..17597e0 100644
--- a/libexec/ftpd/ftpd.c
+++ b/libexec/ftpd/ftpd.c
@@ -1136,7 +1136,9 @@ checkuser(char *fname, char *name, int pwset, char **residue)
* Save the rest of line to "residue" if matched
*/
if (found && residue) {
- if ((p = strtok(NULL, "")) != NULL) {
+ if ((p = strtok(NULL, "")) != NULL)
+ p += strspn(p, " \t");
+ if (p && *p) {
if ((*residue = strdup(p)) == NULL)
fatalerror("Ran out of memory.");
} else
OpenPOWER on IntegriCloud