d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Report an error when a label with invalid name is attempted to be

Browse Source 
created with glabel(8).
- Fix a typo in an error message.
- Fix comment typos.

Approved by:	pjd
This commit is contained in:
Jaakko Heinonen 2010-12-01 19:24:07 +00:00
parent a2299ad8e5
commit e5a2338118
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sys/geom/label/g_label.c
View File

@ -124,13 +124,13 @@ g_label_is_name_ok(const char *label)
{
const char *s;
/* Check is the label starts from ../ */
/* Check if the label starts from ../ */
if (strncmp(label, "../", 3) == 0)
return (0);
/* Check is the label contains /../ */
/* Check if the label contains /../ */
if (strstr(label, "/../") != NULL)
return (0);
/* Check is the label ends at ../ */
/* Check if the label ends at ../ */
if ((s = strstr(label, "/..")) != NULL && s[3] == '\0')
return (0);
return (1);
@ -151,6 +151,8 @@ g_label_create(struct gctl_req *req, struct g_class *mp, struct g_provider *pp,
G_LABEL_DEBUG(0, "%s contains suspicious label, skipping.",
pp->name);
G_LABEL_DEBUG(1, "%s suspicious label is: %s", pp->name, label);
if (req != NULL)
gctl_error(req, "Label name %s is invalid.", label);
return (NULL);
}
gp = NULL;
@ -346,7 +348,7 @@ g_label_ctl_create(struct gctl_req *req, struct g_class *mp)
return;
}
if (*nargs != 2) {
gctl_error(req, "Invalid number of argument.");
gctl_error(req, "Invalid number of arguments.");
return;
}
/*