Skip to content

jail(8): implement NUL-terminated output #1836

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

jail(8): implement NUL-terminated output #1836

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f17cc62
Changes to jail.c to implement NUL-terminated output, triggered by
Sep 3, 2025
3f761bd
Merge branch 'freebsd:main' into jail-nul-patch
kraken-jim Sep 3, 2025
513020e
Merge branch 'freebsd:main' into jail-nul-patch
kraken-jim Sep 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion usr.sbin/jail/jail.8
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,9 @@ Exhibit a list of all configured non-wildcard jails and their parameters.
No jail creation, modification or removal performed if this option is used.
The
.Ar separator
string is used to separate parameters.
string is used to separate parameters. If the separator string is empty (''
or "") then each parameter will be followed by a NUL byte, with one additional
NUL byte at end of each jail's parameters.
Use
.Xr jls 8
utility to list running jails.
Expand Down
25 changes: 22 additions & 3 deletions usr.sbin/jail/jail.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -978,6 +978,7 @@ print_jail(FILE *fp, struct cfjail *j, int oldcl, int running)
#endif
fputs(separator, fp);
print_param(fp, j->intparams[IP_COMMAND], ' ', 0);
putc('\n', fp);
} else {
printsep = 0;
if (running) {
Expand All @@ -987,13 +988,18 @@ print_jail(FILE *fp, struct cfjail *j, int oldcl, int running)
TAILQ_FOREACH(p, &j->params, tq)
if (strcmp(p->name, "jid")) {
if (printsep)
fputs(separator, fp);
*separator ? fputs(separator, fp) : putc(0, fp);
else
printsep = 1;
print_param(fp, p, ',', 1);
print_param(fp, p, *separator ? ',' : '\n', 1);
}
if (*separator)
putc('\n', fp);
else {
putc(0, fp); // end of value line
putc(0, fp); // end of this jail
}
}
putc('\n', fp);
}

/*
Expand Down Expand Up @@ -1038,6 +1044,19 @@ quoted_print(FILE *fp, char *str)
int c, qc;
char *p = str;

/*
* In NUL-delimited mode, output the string as-is with
* no quoting or escaping of any characters.
*/

if (*separator == 0) {
fputs( str, fp );
return;
}

/*
* Otherwise, process it the way we always do:
*/
qc = !*p ? '"'
: strchr(p, '\'') ? '"'
: strchr(p, '"') ? '\''
Expand Down