2003-04-09 03:04:12 +00:00
|
|
|
/*-
|
|
|
|
* Copyright (c) 2003 Mike Barcroft <mike@FreeBSD.org>
|
MFp4:
Bring in updated jail support from bz_jail branch.
This enhances the current jail implementation to permit multiple
addresses per jail. In addtion to IPv4, IPv6 is supported as well.
Due to updated checks it is even possible to have jails without
an IP address at all, which basically gives one a chroot with
restricted process view, no networking,..
SCTP support was updated and supports IPv6 in jails as well.
Cpuset support permits jails to be bound to specific processor
sets after creation.
Jails can have an unrestricted (no duplicate protection, etc.) name
in addition to the hostname. The jail name cannot be changed from
within a jail and is considered to be used for management purposes
or as audit-token in the future.
DDB 'show jails' command was added to aid debugging.
Proper compat support permits 32bit jail binaries to be used on 64bit
systems to manage jails. Also backward compatibility was preserved where
possible: for jail v1 syscalls, as well as with user space management
utilities.
Both jail as well as prison version were updated for the new features.
A gap was intentionally left as the intermediate versions had been
used by various patches floating around the last years.
Bump __FreeBSD_version for the afore mentioned and in kernel changes.
Special thanks to:
- Pawel Jakub Dawidek (pjd) for his multi-IPv4 patches
and Olivier Houchard (cognet) for initial single-IPv6 patches.
- Jeff Roberson (jeff) and Randall Stewart (rrs) for their
help, ideas and review on cpuset and SCTP support.
- Robert Watson (rwatson) for lots and lots of help, discussions,
suggestions and review of most of the patch at various stages.
- John Baldwin (jhb) for his help.
- Simon L. Nielsen (simon) as early adopter testing changes
on cluster machines as well as all the testers and people
who provided feedback the last months on freebsd-jail and
other channels.
- My employer, CK Software GmbH, for the support so I could work on this.
Reviewed by: (see above)
MFC after: 3 months (this is just so that I get the mail)
X-MFC Before: 7.2-RELEASE if possible
2008-11-29 14:32:14 +00:00
|
|
|
* Copyright (c) 2008 Bjoern A. Zeeb <bz@FreeBSD.org>
|
2009-05-27 14:30:26 +00:00
|
|
|
* Copyright (c) 2009 James Gritton <jamie@FreeBSD.org>
|
2003-04-09 03:04:12 +00:00
|
|
|
* All rights reserved.
|
|
|
|
*
|
|
|
|
* Redistribution and use in source and binary forms, with or without
|
|
|
|
* modification, are permitted provided that the following conditions
|
|
|
|
* are met:
|
|
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
|
|
* notice, this list of conditions and the following disclaimer.
|
|
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
|
|
* documentation and/or other materials provided with the distribution.
|
|
|
|
*
|
|
|
|
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
|
|
|
|
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
|
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
|
|
* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
|
|
|
|
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
|
|
|
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
|
|
|
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
|
|
|
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
|
|
|
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
|
|
|
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
|
|
|
* SUCH DAMAGE.
|
|
|
|
*/
|
|
|
|
|
2009-05-27 14:30:26 +00:00
|
|
|
#include <sys/cdefs.h>
|
|
|
|
__FBSDID("$FreeBSD$");
|
|
|
|
|
2003-04-09 03:04:12 +00:00
|
|
|
#include <sys/param.h>
|
|
|
|
#include <sys/jail.h>
|
2009-05-27 14:30:26 +00:00
|
|
|
#include <sys/socket.h>
|
2003-04-09 03:04:12 +00:00
|
|
|
#include <sys/sysctl.h>
|
|
|
|
|
|
|
|
#include <arpa/inet.h>
|
2009-05-27 14:30:26 +00:00
|
|
|
#include <netinet/in.h>
|
|
|
|
|
2003-04-09 03:04:12 +00:00
|
|
|
#include <err.h>
|
|
|
|
#include <errno.h>
|
2009-06-24 18:18:35 +00:00
|
|
|
#include <jail.h>
|
2003-04-09 03:04:12 +00:00
|
|
|
#include <limits.h>
|
|
|
|
#include <stdio.h>
|
|
|
|
#include <stdlib.h>
|
MFp4:
Bring in updated jail support from bz_jail branch.
This enhances the current jail implementation to permit multiple
addresses per jail. In addtion to IPv4, IPv6 is supported as well.
Due to updated checks it is even possible to have jails without
an IP address at all, which basically gives one a chroot with
restricted process view, no networking,..
SCTP support was updated and supports IPv6 in jails as well.
Cpuset support permits jails to be bound to specific processor
sets after creation.
Jails can have an unrestricted (no duplicate protection, etc.) name
in addition to the hostname. The jail name cannot be changed from
within a jail and is considered to be used for management purposes
or as audit-token in the future.
DDB 'show jails' command was added to aid debugging.
Proper compat support permits 32bit jail binaries to be used on 64bit
systems to manage jails. Also backward compatibility was preserved where
possible: for jail v1 syscalls, as well as with user space management
utilities.
Both jail as well as prison version were updated for the new features.
A gap was intentionally left as the intermediate versions had been
used by various patches floating around the last years.
Bump __FreeBSD_version for the afore mentioned and in kernel changes.
Special thanks to:
- Pawel Jakub Dawidek (pjd) for his multi-IPv4 patches
and Olivier Houchard (cognet) for initial single-IPv6 patches.
- Jeff Roberson (jeff) and Randall Stewart (rrs) for their
help, ideas and review on cpuset and SCTP support.
- Robert Watson (rwatson) for lots and lots of help, discussions,
suggestions and review of most of the patch at various stages.
- John Baldwin (jhb) for his help.
- Simon L. Nielsen (simon) as early adopter testing changes
on cluster machines as well as all the testers and people
who provided feedback the last months on freebsd-jail and
other channels.
- My employer, CK Software GmbH, for the support so I could work on this.
Reviewed by: (see above)
MFC after: 3 months (this is just so that I get the mail)
X-MFC Before: 7.2-RELEASE if possible
2008-11-29 14:32:14 +00:00
|
|
|
#include <string.h>
|
|
|
|
#include <unistd.h>
|
2003-04-09 03:04:12 +00:00
|
|
|
|
2009-06-24 18:18:35 +00:00
|
|
|
#define JP_USER 0x01000000
|
|
|
|
#define JP_OPT 0x02000000
|
2009-05-27 14:30:26 +00:00
|
|
|
|
|
|
|
#define PRINT_DEFAULT 0x01
|
|
|
|
#define PRINT_HEADER 0x02
|
|
|
|
#define PRINT_NAMEVAL 0x04
|
|
|
|
#define PRINT_QUOTED 0x08
|
|
|
|
#define PRINT_SKIP 0x10
|
|
|
|
#define PRINT_VERBOSE 0x20
|
|
|
|
|
2009-06-24 18:18:35 +00:00
|
|
|
static struct jailparam *params;
|
|
|
|
static int *param_noparent;
|
2009-05-27 14:30:26 +00:00
|
|
|
static int nparams;
|
|
|
|
|
2009-06-24 18:18:35 +00:00
|
|
|
static int add_param(const char *name, void *value, size_t valuelen,
|
|
|
|
struct jailparam *source, unsigned flags);
|
2009-05-27 14:30:26 +00:00
|
|
|
static int sort_param(const void *a, const void *b);
|
|
|
|
static char *noname(const char *name);
|
|
|
|
static char *nononame(const char *name);
|
|
|
|
static int print_jail(int pflags, int jflags);
|
2009-06-24 18:18:35 +00:00
|
|
|
static void quoted_print(char *str);
|
MFp4:
Bring in updated jail support from bz_jail branch.
This enhances the current jail implementation to permit multiple
addresses per jail. In addtion to IPv4, IPv6 is supported as well.
Due to updated checks it is even possible to have jails without
an IP address at all, which basically gives one a chroot with
restricted process view, no networking,..
SCTP support was updated and supports IPv6 in jails as well.
Cpuset support permits jails to be bound to specific processor
sets after creation.
Jails can have an unrestricted (no duplicate protection, etc.) name
in addition to the hostname. The jail name cannot be changed from
within a jail and is considered to be used for management purposes
or as audit-token in the future.
DDB 'show jails' command was added to aid debugging.
Proper compat support permits 32bit jail binaries to be used on 64bit
systems to manage jails. Also backward compatibility was preserved where
possible: for jail v1 syscalls, as well as with user space management
utilities.
Both jail as well as prison version were updated for the new features.
A gap was intentionally left as the intermediate versions had been
used by various patches floating around the last years.
Bump __FreeBSD_version for the afore mentioned and in kernel changes.
Special thanks to:
- Pawel Jakub Dawidek (pjd) for his multi-IPv4 patches
and Olivier Houchard (cognet) for initial single-IPv6 patches.
- Jeff Roberson (jeff) and Randall Stewart (rrs) for their
help, ideas and review on cpuset and SCTP support.
- Robert Watson (rwatson) for lots and lots of help, discussions,
suggestions and review of most of the patch at various stages.
- John Baldwin (jhb) for his help.
- Simon L. Nielsen (simon) as early adopter testing changes
on cluster machines as well as all the testers and people
who provided feedback the last months on freebsd-jail and
other channels.
- My employer, CK Software GmbH, for the support so I could work on this.
Reviewed by: (see above)
MFC after: 3 months (this is just so that I get the mail)
X-MFC Before: 7.2-RELEASE if possible
2008-11-29 14:32:14 +00:00
|
|
|
|
2009-05-27 14:30:26 +00:00
|
|
|
int
|
|
|
|
main(int argc, char **argv)
|
MFp4:
Bring in updated jail support from bz_jail branch.
This enhances the current jail implementation to permit multiple
addresses per jail. In addtion to IPv4, IPv6 is supported as well.
Due to updated checks it is even possible to have jails without
an IP address at all, which basically gives one a chroot with
restricted process view, no networking,..
SCTP support was updated and supports IPv6 in jails as well.
Cpuset support permits jails to be bound to specific processor
sets after creation.
Jails can have an unrestricted (no duplicate protection, etc.) name
in addition to the hostname. The jail name cannot be changed from
within a jail and is considered to be used for management purposes
or as audit-token in the future.
DDB 'show jails' command was added to aid debugging.
Proper compat support permits 32bit jail binaries to be used on 64bit
systems to manage jails. Also backward compatibility was preserved where
possible: for jail v1 syscalls, as well as with user space management
utilities.
Both jail as well as prison version were updated for the new features.
A gap was intentionally left as the intermediate versions had been
used by various patches floating around the last years.
Bump __FreeBSD_version for the afore mentioned and in kernel changes.
Special thanks to:
- Pawel Jakub Dawidek (pjd) for his multi-IPv4 patches
and Olivier Houchard (cognet) for initial single-IPv6 patches.
- Jeff Roberson (jeff) and Randall Stewart (rrs) for their
help, ideas and review on cpuset and SCTP support.
- Robert Watson (rwatson) for lots and lots of help, discussions,
suggestions and review of most of the patch at various stages.
- John Baldwin (jhb) for his help.
- Simon L. Nielsen (simon) as early adopter testing changes
on cluster machines as well as all the testers and people
who provided feedback the last months on freebsd-jail and
other channels.
- My employer, CK Software GmbH, for the support so I could work on this.
Reviewed by: (see above)
MFC after: 3 months (this is just so that I get the mail)
X-MFC Before: 7.2-RELEASE if possible
2008-11-29 14:32:14 +00:00
|
|
|
{
|
2009-05-27 14:30:26 +00:00
|
|
|
char *dot, *ep, *jname, *nname;
|
|
|
|
int c, i, jflags, jid, lastjid, pflags, spc;
|
|
|
|
|
|
|
|
jname = NULL;
|
|
|
|
pflags = jflags = jid = 0;
|
|
|
|
while ((c = getopt(argc, argv, "adj:hnqsv")) >= 0)
|
|
|
|
switch (c) {
|
|
|
|
case 'a':
|
|
|
|
case 'd':
|
|
|
|
jflags |= JAIL_DYING;
|
|
|
|
break;
|
|
|
|
case 'j':
|
|
|
|
jid = strtoul(optarg, &ep, 10);
|
|
|
|
if (!*optarg || *ep)
|
|
|
|
jname = optarg;
|
|
|
|
break;
|
|
|
|
case 'h':
|
2009-07-08 15:57:22 +00:00
|
|
|
pflags = (pflags & ~(PRINT_SKIP | PRINT_VERBOSE)) |
|
|
|
|
PRINT_HEADER;
|
2009-05-27 14:30:26 +00:00
|
|
|
break;
|
|
|
|
case 'n':
|
|
|
|
pflags = (pflags & ~PRINT_VERBOSE) | PRINT_NAMEVAL;
|
|
|
|
break;
|
|
|
|
case 'q':
|
|
|
|
pflags |= PRINT_QUOTED;
|
|
|
|
break;
|
|
|
|
case 's':
|
|
|
|
pflags = (pflags & ~(PRINT_HEADER | PRINT_VERBOSE)) |
|
|
|
|
PRINT_NAMEVAL | PRINT_QUOTED | PRINT_SKIP;
|
|
|
|
break;
|
|
|
|
case 'v':
|
2009-07-08 15:57:22 +00:00
|
|
|
pflags = (pflags &
|
|
|
|
~(PRINT_HEADER | PRINT_NAMEVAL | PRINT_SKIP)) |
|
2009-05-27 14:30:26 +00:00
|
|
|
PRINT_VERBOSE;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
errx(1, "usage: jls [-dhnqv] [-j jail] [param ...]");
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Add the parameters to print. */
|
|
|
|
if (optind == argc) {
|
2009-07-08 15:57:22 +00:00
|
|
|
if (pflags & (PRINT_HEADER | PRINT_NAMEVAL))
|
|
|
|
add_param("all", NULL, (size_t)0, NULL, JP_USER);
|
|
|
|
else if (pflags & PRINT_VERBOSE) {
|
2009-06-24 18:18:35 +00:00
|
|
|
add_param("jid", NULL, (size_t)0, NULL, JP_USER);
|
|
|
|
add_param("host.hostname", NULL, (size_t)0, NULL,
|
|
|
|
JP_USER);
|
|
|
|
add_param("path", NULL, (size_t)0, NULL, JP_USER);
|
|
|
|
add_param("name", NULL, (size_t)0, NULL, JP_USER);
|
|
|
|
add_param("dying", NULL, (size_t)0, NULL, JP_USER);
|
|
|
|
add_param("cpuset.id", NULL, (size_t)0, NULL, JP_USER);
|
|
|
|
add_param("ip4.addr", NULL, (size_t)0, NULL, JP_USER);
|
|
|
|
add_param("ip6.addr", NULL, (size_t)0, NULL,
|
|
|
|
JP_USER | JP_OPT);
|
2009-05-27 14:30:26 +00:00
|
|
|
} else {
|
2009-07-08 15:57:22 +00:00
|
|
|
pflags |= PRINT_DEFAULT;
|
2009-06-24 18:18:35 +00:00
|
|
|
add_param("jid", NULL, (size_t)0, NULL, JP_USER);
|
|
|
|
add_param("ip4.addr", NULL, (size_t)0, NULL, JP_USER);
|
|
|
|
add_param("host.hostname", NULL, (size_t)0, NULL,
|
|
|
|
JP_USER);
|
|
|
|
add_param("path", NULL, (size_t)0, NULL, JP_USER);
|
2009-05-27 14:30:26 +00:00
|
|
|
}
|
|
|
|
} else
|
|
|
|
while (optind < argc)
|
2009-06-24 18:18:35 +00:00
|
|
|
add_param(argv[optind++], NULL, (size_t)0, NULL,
|
|
|
|
JP_USER);
|
2009-05-27 14:30:26 +00:00
|
|
|
|
|
|
|
if (pflags & PRINT_SKIP) {
|
|
|
|
/* Check for parameters with boolean parents. */
|
|
|
|
for (i = 0; i < nparams; i++) {
|
2009-06-24 18:18:35 +00:00
|
|
|
if ((params[i].jp_flags & JP_USER) &&
|
|
|
|
(dot = strchr(params[i].jp_name, '.'))) {
|
2009-05-27 14:30:26 +00:00
|
|
|
*dot = 0;
|
2009-06-24 18:18:35 +00:00
|
|
|
nname = noname(params[i].jp_name);
|
2009-05-27 14:30:26 +00:00
|
|
|
*dot = '.';
|
2009-06-24 18:18:35 +00:00
|
|
|
param_noparent[i] =
|
|
|
|
add_param(nname, NULL, (size_t)0, NULL,
|
|
|
|
JP_OPT);
|
2009-05-27 14:30:26 +00:00
|
|
|
free(nname);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2009-06-24 18:18:35 +00:00
|
|
|
/* Add the index key parameters. */
|
2009-05-27 14:30:26 +00:00
|
|
|
if (jid != 0)
|
2009-06-24 18:18:35 +00:00
|
|
|
add_param("jid", &jid, sizeof(jid), NULL, 0);
|
2009-05-27 14:30:26 +00:00
|
|
|
else if (jname != NULL)
|
2009-06-24 18:18:35 +00:00
|
|
|
add_param("name", jname, strlen(jname), NULL, 0);
|
2009-05-27 14:30:26 +00:00
|
|
|
else
|
2009-06-24 18:18:35 +00:00
|
|
|
add_param("lastjid", &lastjid, sizeof(lastjid), NULL, 0);
|
2009-05-27 14:30:26 +00:00
|
|
|
|
|
|
|
/* Print a header line if requested. */
|
|
|
|
if (pflags & PRINT_VERBOSE)
|
|
|
|
printf(" JID Hostname Path\n"
|
|
|
|
" Name State\n"
|
|
|
|
" CPUSetID\n"
|
|
|
|
" IP Address(es)\n");
|
|
|
|
else if (pflags & PRINT_DEFAULT)
|
|
|
|
printf(" JID IP Address "
|
|
|
|
"Hostname Path\n");
|
|
|
|
else if (pflags & PRINT_HEADER) {
|
|
|
|
for (i = spc = 0; i < nparams; i++)
|
2009-06-24 18:18:35 +00:00
|
|
|
if (params[i].jp_flags & JP_USER) {
|
2009-05-27 14:30:26 +00:00
|
|
|
if (spc)
|
|
|
|
putchar(' ');
|
|
|
|
else
|
|
|
|
spc = 1;
|
2009-06-24 18:18:35 +00:00
|
|
|
fputs(params[i].jp_name, stdout);
|
2009-05-27 14:30:26 +00:00
|
|
|
}
|
|
|
|
putchar('\n');
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Fetch the jail(s) and print the paramters. */
|
|
|
|
if (jid != 0 || jname != NULL) {
|
2009-06-24 18:18:35 +00:00
|
|
|
if (print_jail(pflags, jflags) < 0)
|
|
|
|
errx(1, "%s", jail_errmsg);
|
2008-12-14 16:56:47 +00:00
|
|
|
} else {
|
2009-05-27 14:30:26 +00:00
|
|
|
for (lastjid = 0;
|
|
|
|
(lastjid = print_jail(pflags, jflags)) >= 0; )
|
|
|
|
;
|
2009-06-24 18:18:35 +00:00
|
|
|
if (errno != 0 && errno != ENOENT)
|
|
|
|
errx(1, "%s", jail_errmsg);
|
2008-12-14 16:56:47 +00:00
|
|
|
}
|
MFp4:
Bring in updated jail support from bz_jail branch.
This enhances the current jail implementation to permit multiple
addresses per jail. In addtion to IPv4, IPv6 is supported as well.
Due to updated checks it is even possible to have jails without
an IP address at all, which basically gives one a chroot with
restricted process view, no networking,..
SCTP support was updated and supports IPv6 in jails as well.
Cpuset support permits jails to be bound to specific processor
sets after creation.
Jails can have an unrestricted (no duplicate protection, etc.) name
in addition to the hostname. The jail name cannot be changed from
within a jail and is considered to be used for management purposes
or as audit-token in the future.
DDB 'show jails' command was added to aid debugging.
Proper compat support permits 32bit jail binaries to be used on 64bit
systems to manage jails. Also backward compatibility was preserved where
possible: for jail v1 syscalls, as well as with user space management
utilities.
Both jail as well as prison version were updated for the new features.
A gap was intentionally left as the intermediate versions had been
used by various patches floating around the last years.
Bump __FreeBSD_version for the afore mentioned and in kernel changes.
Special thanks to:
- Pawel Jakub Dawidek (pjd) for his multi-IPv4 patches
and Olivier Houchard (cognet) for initial single-IPv6 patches.
- Jeff Roberson (jeff) and Randall Stewart (rrs) for their
help, ideas and review on cpuset and SCTP support.
- Robert Watson (rwatson) for lots and lots of help, discussions,
suggestions and review of most of the patch at various stages.
- John Baldwin (jhb) for his help.
- Simon L. Nielsen (simon) as early adopter testing changes
on cluster machines as well as all the testers and people
who provided feedback the last months on freebsd-jail and
other channels.
- My employer, CK Software GmbH, for the support so I could work on this.
Reviewed by: (see above)
MFC after: 3 months (this is just so that I get the mail)
X-MFC Before: 7.2-RELEASE if possible
2008-11-29 14:32:14 +00:00
|
|
|
|
2009-05-27 14:30:26 +00:00
|
|
|
return (0);
|
MFp4:
Bring in updated jail support from bz_jail branch.
This enhances the current jail implementation to permit multiple
addresses per jail. In addtion to IPv4, IPv6 is supported as well.
Due to updated checks it is even possible to have jails without
an IP address at all, which basically gives one a chroot with
restricted process view, no networking,..
SCTP support was updated and supports IPv6 in jails as well.
Cpuset support permits jails to be bound to specific processor
sets after creation.
Jails can have an unrestricted (no duplicate protection, etc.) name
in addition to the hostname. The jail name cannot be changed from
within a jail and is considered to be used for management purposes
or as audit-token in the future.
DDB 'show jails' command was added to aid debugging.
Proper compat support permits 32bit jail binaries to be used on 64bit
systems to manage jails. Also backward compatibility was preserved where
possible: for jail v1 syscalls, as well as with user space management
utilities.
Both jail as well as prison version were updated for the new features.
A gap was intentionally left as the intermediate versions had been
used by various patches floating around the last years.
Bump __FreeBSD_version for the afore mentioned and in kernel changes.
Special thanks to:
- Pawel Jakub Dawidek (pjd) for his multi-IPv4 patches
and Olivier Houchard (cognet) for initial single-IPv6 patches.
- Jeff Roberson (jeff) and Randall Stewart (rrs) for their
help, ideas and review on cpuset and SCTP support.
- Robert Watson (rwatson) for lots and lots of help, discussions,
suggestions and review of most of the patch at various stages.
- John Baldwin (jhb) for his help.
- Simon L. Nielsen (simon) as early adopter testing changes
on cluster machines as well as all the testers and people
who provided feedback the last months on freebsd-jail and
other channels.
- My employer, CK Software GmbH, for the support so I could work on this.
Reviewed by: (see above)
MFC after: 3 months (this is just so that I get the mail)
X-MFC Before: 7.2-RELEASE if possible
2008-11-29 14:32:14 +00:00
|
|
|
}
|
|
|
|
|
2009-05-27 14:30:26 +00:00
|
|
|
static int
|
2009-06-24 18:18:35 +00:00
|
|
|
add_param(const char *name, void *value, size_t valuelen,
|
|
|
|
struct jailparam *source, unsigned flags)
|
MFp4:
Bring in updated jail support from bz_jail branch.
This enhances the current jail implementation to permit multiple
addresses per jail. In addtion to IPv4, IPv6 is supported as well.
Due to updated checks it is even possible to have jails without
an IP address at all, which basically gives one a chroot with
restricted process view, no networking,..
SCTP support was updated and supports IPv6 in jails as well.
Cpuset support permits jails to be bound to specific processor
sets after creation.
Jails can have an unrestricted (no duplicate protection, etc.) name
in addition to the hostname. The jail name cannot be changed from
within a jail and is considered to be used for management purposes
or as audit-token in the future.
DDB 'show jails' command was added to aid debugging.
Proper compat support permits 32bit jail binaries to be used on 64bit
systems to manage jails. Also backward compatibility was preserved where
possible: for jail v1 syscalls, as well as with user space management
utilities.
Both jail as well as prison version were updated for the new features.
A gap was intentionally left as the intermediate versions had been
used by various patches floating around the last years.
Bump __FreeBSD_version for the afore mentioned and in kernel changes.
Special thanks to:
- Pawel Jakub Dawidek (pjd) for his multi-IPv4 patches
and Olivier Houchard (cognet) for initial single-IPv6 patches.
- Jeff Roberson (jeff) and Randall Stewart (rrs) for their
help, ideas and review on cpuset and SCTP support.
- Robert Watson (rwatson) for lots and lots of help, discussions,
suggestions and review of most of the patch at various stages.
- John Baldwin (jhb) for his help.
- Simon L. Nielsen (simon) as early adopter testing changes
on cluster machines as well as all the testers and people
who provided feedback the last months on freebsd-jail and
other channels.
- My employer, CK Software GmbH, for the support so I could work on this.
Reviewed by: (see above)
MFC after: 3 months (this is just so that I get the mail)
X-MFC Before: 7.2-RELEASE if possible
2008-11-29 14:32:14 +00:00
|
|
|
{
|
2009-06-24 18:18:35 +00:00
|
|
|
struct jailparam *param, *tparams;
|
2009-05-27 14:30:26 +00:00
|
|
|
int i, tnparams;
|
|
|
|
|
|
|
|
static int paramlistsize;
|
|
|
|
|
|
|
|
/* The pseudo-parameter "all" scans the list of available parameters. */
|
|
|
|
if (!strcmp(name, "all")) {
|
2009-06-24 18:18:35 +00:00
|
|
|
tnparams = jailparam_all(&tparams);
|
|
|
|
if (tnparams < 0)
|
|
|
|
errx(1, "%s", jail_errmsg);
|
|
|
|
qsort(tparams, (size_t)tnparams, sizeof(struct jailparam),
|
|
|
|
sort_param);
|
|
|
|
for (i = 0; i < tnparams; i++)
|
|
|
|
add_param(tparams[i].jp_name, NULL, (size_t)0,
|
|
|
|
tparams + i, flags);
|
|
|
|
free(tparams);
|
2009-05-27 14:30:26 +00:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Check for repeat parameters. */
|
|
|
|
for (i = 0; i < nparams; i++)
|
2009-06-24 18:18:35 +00:00
|
|
|
if (!strcmp(name, params[i].jp_name)) {
|
|
|
|
if (value != NULL && jailparam_import_raw(params + i,
|
|
|
|
value, valuelen) < 0)
|
|
|
|
errx(1, "%s", jail_errmsg);
|
|
|
|
params[i].jp_flags |= flags;
|
|
|
|
if (source != NULL)
|
|
|
|
jailparam_free(source, 1);
|
2009-05-27 14:30:26 +00:00
|
|
|
return i;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Make sure there is room for the new param record. */
|
|
|
|
if (!nparams) {
|
|
|
|
paramlistsize = 32;
|
|
|
|
params = malloc(paramlistsize * sizeof(*params));
|
2009-06-24 18:18:35 +00:00
|
|
|
param_noparent =
|
|
|
|
malloc(paramlistsize * sizeof(*param_noparent));
|
|
|
|
if (params == NULL || param_noparent == NULL)
|
2009-05-27 14:30:26 +00:00
|
|
|
err(1, "malloc");
|
|
|
|
} else if (nparams >= paramlistsize) {
|
|
|
|
paramlistsize *= 2;
|
|
|
|
params = realloc(params, paramlistsize * sizeof(*params));
|
2009-06-24 18:18:35 +00:00
|
|
|
param_noparent = realloc(param_noparent,
|
|
|
|
paramlistsize * sizeof(*param_noparent));
|
|
|
|
if (params == NULL || param_noparent == NULL)
|
2009-05-27 14:30:26 +00:00
|
|
|
err(1, "realloc");
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Look up the parameter. */
|
2009-06-24 18:18:35 +00:00
|
|
|
param_noparent[nparams] = -1;
|
2009-05-27 14:30:26 +00:00
|
|
|
param = params + nparams++;
|
2009-06-24 18:18:35 +00:00
|
|
|
if (source != NULL) {
|
|
|
|
*param = *source;
|
|
|
|
param->jp_flags |= flags;
|
|
|
|
return param - params;
|
2009-05-27 14:30:26 +00:00
|
|
|
}
|
2009-06-24 18:18:35 +00:00
|
|
|
if (jailparam_init(param, name) < 0)
|
|
|
|
errx(1, "%s", jail_errmsg);
|
|
|
|
param->jp_flags = flags;
|
|
|
|
if ((value != NULL ? jailparam_import_raw(param, value, valuelen)
|
|
|
|
: jailparam_import(param, value)) < 0) {
|
|
|
|
if (flags & JP_OPT) {
|
2009-05-27 14:30:26 +00:00
|
|
|
nparams--;
|
2009-06-24 18:18:35 +00:00
|
|
|
return (-1);
|
2009-05-27 14:30:26 +00:00
|
|
|
}
|
2009-06-24 18:18:35 +00:00
|
|
|
errx(1, "%s", jail_errmsg);
|
MFp4:
Bring in updated jail support from bz_jail branch.
This enhances the current jail implementation to permit multiple
addresses per jail. In addtion to IPv4, IPv6 is supported as well.
Due to updated checks it is even possible to have jails without
an IP address at all, which basically gives one a chroot with
restricted process view, no networking,..
SCTP support was updated and supports IPv6 in jails as well.
Cpuset support permits jails to be bound to specific processor
sets after creation.
Jails can have an unrestricted (no duplicate protection, etc.) name
in addition to the hostname. The jail name cannot be changed from
within a jail and is considered to be used for management purposes
or as audit-token in the future.
DDB 'show jails' command was added to aid debugging.
Proper compat support permits 32bit jail binaries to be used on 64bit
systems to manage jails. Also backward compatibility was preserved where
possible: for jail v1 syscalls, as well as with user space management
utilities.
Both jail as well as prison version were updated for the new features.
A gap was intentionally left as the intermediate versions had been
used by various patches floating around the last years.
Bump __FreeBSD_version for the afore mentioned and in kernel changes.
Special thanks to:
- Pawel Jakub Dawidek (pjd) for his multi-IPv4 patches
and Olivier Houchard (cognet) for initial single-IPv6 patches.
- Jeff Roberson (jeff) and Randall Stewart (rrs) for their
help, ideas and review on cpuset and SCTP support.
- Robert Watson (rwatson) for lots and lots of help, discussions,
suggestions and review of most of the patch at various stages.
- John Baldwin (jhb) for his help.
- Simon L. Nielsen (simon) as early adopter testing changes
on cluster machines as well as all the testers and people
who provided feedback the last months on freebsd-jail and
other channels.
- My employer, CK Software GmbH, for the support so I could work on this.
Reviewed by: (see above)
MFC after: 3 months (this is just so that I get the mail)
X-MFC Before: 7.2-RELEASE if possible
2008-11-29 14:32:14 +00:00
|
|
|
}
|
2009-05-27 14:30:26 +00:00
|
|
|
return param - params;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
sort_param(const void *a, const void *b)
|
|
|
|
{
|
2009-06-24 18:18:35 +00:00
|
|
|
const struct jailparam *parama, *paramb;
|
2009-05-27 14:30:26 +00:00
|
|
|
char *ap, *bp;
|
2008-12-14 16:56:47 +00:00
|
|
|
|
2009-05-27 14:30:26 +00:00
|
|
|
/* Put top-level parameters first. */
|
|
|
|
parama = a;
|
|
|
|
paramb = b;
|
2009-06-24 18:18:35 +00:00
|
|
|
ap = strchr(parama->jp_name, '.');
|
|
|
|
bp = strchr(paramb->jp_name, '.');
|
2009-05-27 14:30:26 +00:00
|
|
|
if (ap && !bp)
|
|
|
|
return (1);
|
|
|
|
if (bp && !ap)
|
|
|
|
return (-1);
|
2009-06-24 18:18:35 +00:00
|
|
|
return (strcmp(parama->jp_name, paramb->jp_name));
|
MFp4:
Bring in updated jail support from bz_jail branch.
This enhances the current jail implementation to permit multiple
addresses per jail. In addtion to IPv4, IPv6 is supported as well.
Due to updated checks it is even possible to have jails without
an IP address at all, which basically gives one a chroot with
restricted process view, no networking,..
SCTP support was updated and supports IPv6 in jails as well.
Cpuset support permits jails to be bound to specific processor
sets after creation.
Jails can have an unrestricted (no duplicate protection, etc.) name
in addition to the hostname. The jail name cannot be changed from
within a jail and is considered to be used for management purposes
or as audit-token in the future.
DDB 'show jails' command was added to aid debugging.
Proper compat support permits 32bit jail binaries to be used on 64bit
systems to manage jails. Also backward compatibility was preserved where
possible: for jail v1 syscalls, as well as with user space management
utilities.
Both jail as well as prison version were updated for the new features.
A gap was intentionally left as the intermediate versions had been
used by various patches floating around the last years.
Bump __FreeBSD_version for the afore mentioned and in kernel changes.
Special thanks to:
- Pawel Jakub Dawidek (pjd) for his multi-IPv4 patches
and Olivier Houchard (cognet) for initial single-IPv6 patches.
- Jeff Roberson (jeff) and Randall Stewart (rrs) for their
help, ideas and review on cpuset and SCTP support.
- Robert Watson (rwatson) for lots and lots of help, discussions,
suggestions and review of most of the patch at various stages.
- John Baldwin (jhb) for his help.
- Simon L. Nielsen (simon) as early adopter testing changes
on cluster machines as well as all the testers and people
who provided feedback the last months on freebsd-jail and
other channels.
- My employer, CK Software GmbH, for the support so I could work on this.
Reviewed by: (see above)
MFC after: 3 months (this is just so that I get the mail)
X-MFC Before: 7.2-RELEASE if possible
2008-11-29 14:32:14 +00:00
|
|
|
}
|
|
|
|
|
2009-05-27 14:30:26 +00:00
|
|
|
static char *
|
|
|
|
noname(const char *name)
|
MFp4:
Bring in updated jail support from bz_jail branch.
This enhances the current jail implementation to permit multiple
addresses per jail. In addtion to IPv4, IPv6 is supported as well.
Due to updated checks it is even possible to have jails without
an IP address at all, which basically gives one a chroot with
restricted process view, no networking,..
SCTP support was updated and supports IPv6 in jails as well.
Cpuset support permits jails to be bound to specific processor
sets after creation.
Jails can have an unrestricted (no duplicate protection, etc.) name
in addition to the hostname. The jail name cannot be changed from
within a jail and is considered to be used for management purposes
or as audit-token in the future.
DDB 'show jails' command was added to aid debugging.
Proper compat support permits 32bit jail binaries to be used on 64bit
systems to manage jails. Also backward compatibility was preserved where
possible: for jail v1 syscalls, as well as with user space management
utilities.
Both jail as well as prison version were updated for the new features.
A gap was intentionally left as the intermediate versions had been
used by various patches floating around the last years.
Bump __FreeBSD_version for the afore mentioned and in kernel changes.
Special thanks to:
- Pawel Jakub Dawidek (pjd) for his multi-IPv4 patches
and Olivier Houchard (cognet) for initial single-IPv6 patches.
- Jeff Roberson (jeff) and Randall Stewart (rrs) for their
help, ideas and review on cpuset and SCTP support.
- Robert Watson (rwatson) for lots and lots of help, discussions,
suggestions and review of most of the patch at various stages.
- John Baldwin (jhb) for his help.
- Simon L. Nielsen (simon) as early adopter testing changes
on cluster machines as well as all the testers and people
who provided feedback the last months on freebsd-jail and
other channels.
- My employer, CK Software GmbH, for the support so I could work on this.
Reviewed by: (see above)
MFC after: 3 months (this is just so that I get the mail)
X-MFC Before: 7.2-RELEASE if possible
2008-11-29 14:32:14 +00:00
|
|
|
{
|
2009-05-27 14:30:26 +00:00
|
|
|
char *nname, *p;
|
MFp4:
Bring in updated jail support from bz_jail branch.
This enhances the current jail implementation to permit multiple
addresses per jail. In addtion to IPv4, IPv6 is supported as well.
Due to updated checks it is even possible to have jails without
an IP address at all, which basically gives one a chroot with
restricted process view, no networking,..
SCTP support was updated and supports IPv6 in jails as well.
Cpuset support permits jails to be bound to specific processor
sets after creation.
Jails can have an unrestricted (no duplicate protection, etc.) name
in addition to the hostname. The jail name cannot be changed from
within a jail and is considered to be used for management purposes
or as audit-token in the future.
DDB 'show jails' command was added to aid debugging.
Proper compat support permits 32bit jail binaries to be used on 64bit
systems to manage jails. Also backward compatibility was preserved where
possible: for jail v1 syscalls, as well as with user space management
utilities.
Both jail as well as prison version were updated for the new features.
A gap was intentionally left as the intermediate versions had been
used by various patches floating around the last years.
Bump __FreeBSD_version for the afore mentioned and in kernel changes.
Special thanks to:
- Pawel Jakub Dawidek (pjd) for his multi-IPv4 patches
and Olivier Houchard (cognet) for initial single-IPv6 patches.
- Jeff Roberson (jeff) and Randall Stewart (rrs) for their
help, ideas and review on cpuset and SCTP support.
- Robert Watson (rwatson) for lots and lots of help, discussions,
suggestions and review of most of the patch at various stages.
- John Baldwin (jhb) for his help.
- Simon L. Nielsen (simon) as early adopter testing changes
on cluster machines as well as all the testers and people
who provided feedback the last months on freebsd-jail and
other channels.
- My employer, CK Software GmbH, for the support so I could work on this.
Reviewed by: (see above)
MFC after: 3 months (this is just so that I get the mail)
X-MFC Before: 7.2-RELEASE if possible
2008-11-29 14:32:14 +00:00
|
|
|
|
2009-05-27 14:30:26 +00:00
|
|
|
nname = malloc(strlen(name) + 3);
|
|
|
|
if (nname == NULL)
|
|
|
|
err(1, "malloc");
|
|
|
|
p = strrchr(name, '.');
|
|
|
|
if (p != NULL)
|
|
|
|
sprintf(nname, "%.*s.no%s", (int)(p - name), name, p + 1);
|
|
|
|
else
|
|
|
|
sprintf(nname, "no%s", name);
|
|
|
|
return nname;
|
MFp4:
Bring in updated jail support from bz_jail branch.
This enhances the current jail implementation to permit multiple
addresses per jail. In addtion to IPv4, IPv6 is supported as well.
Due to updated checks it is even possible to have jails without
an IP address at all, which basically gives one a chroot with
restricted process view, no networking,..
SCTP support was updated and supports IPv6 in jails as well.
Cpuset support permits jails to be bound to specific processor
sets after creation.
Jails can have an unrestricted (no duplicate protection, etc.) name
in addition to the hostname. The jail name cannot be changed from
within a jail and is considered to be used for management purposes
or as audit-token in the future.
DDB 'show jails' command was added to aid debugging.
Proper compat support permits 32bit jail binaries to be used on 64bit
systems to manage jails. Also backward compatibility was preserved where
possible: for jail v1 syscalls, as well as with user space management
utilities.
Both jail as well as prison version were updated for the new features.
A gap was intentionally left as the intermediate versions had been
used by various patches floating around the last years.
Bump __FreeBSD_version for the afore mentioned and in kernel changes.
Special thanks to:
- Pawel Jakub Dawidek (pjd) for his multi-IPv4 patches
and Olivier Houchard (cognet) for initial single-IPv6 patches.
- Jeff Roberson (jeff) and Randall Stewart (rrs) for their
help, ideas and review on cpuset and SCTP support.
- Robert Watson (rwatson) for lots and lots of help, discussions,
suggestions and review of most of the patch at various stages.
- John Baldwin (jhb) for his help.
- Simon L. Nielsen (simon) as early adopter testing changes
on cluster machines as well as all the testers and people
who provided feedback the last months on freebsd-jail and
other channels.
- My employer, CK Software GmbH, for the support so I could work on this.
Reviewed by: (see above)
MFC after: 3 months (this is just so that I get the mail)
X-MFC Before: 7.2-RELEASE if possible
2008-11-29 14:32:14 +00:00
|
|
|
}
|
2003-04-09 03:04:12 +00:00
|
|
|
|
2009-05-27 14:30:26 +00:00
|
|
|
static char *
|
|
|
|
nononame(const char *name)
|
|
|
|
{
|
|
|
|
char *nname, *p;
|
MFp4:
Bring in updated jail support from bz_jail branch.
This enhances the current jail implementation to permit multiple
addresses per jail. In addtion to IPv4, IPv6 is supported as well.
Due to updated checks it is even possible to have jails without
an IP address at all, which basically gives one a chroot with
restricted process view, no networking,..
SCTP support was updated and supports IPv6 in jails as well.
Cpuset support permits jails to be bound to specific processor
sets after creation.
Jails can have an unrestricted (no duplicate protection, etc.) name
in addition to the hostname. The jail name cannot be changed from
within a jail and is considered to be used for management purposes
or as audit-token in the future.
DDB 'show jails' command was added to aid debugging.
Proper compat support permits 32bit jail binaries to be used on 64bit
systems to manage jails. Also backward compatibility was preserved where
possible: for jail v1 syscalls, as well as with user space management
utilities.
Both jail as well as prison version were updated for the new features.
A gap was intentionally left as the intermediate versions had been
used by various patches floating around the last years.
Bump __FreeBSD_version for the afore mentioned and in kernel changes.
Special thanks to:
- Pawel Jakub Dawidek (pjd) for his multi-IPv4 patches
and Olivier Houchard (cognet) for initial single-IPv6 patches.
- Jeff Roberson (jeff) and Randall Stewart (rrs) for their
help, ideas and review on cpuset and SCTP support.
- Robert Watson (rwatson) for lots and lots of help, discussions,
suggestions and review of most of the patch at various stages.
- John Baldwin (jhb) for his help.
- Simon L. Nielsen (simon) as early adopter testing changes
on cluster machines as well as all the testers and people
who provided feedback the last months on freebsd-jail and
other channels.
- My employer, CK Software GmbH, for the support so I could work on this.
Reviewed by: (see above)
MFC after: 3 months (this is just so that I get the mail)
X-MFC Before: 7.2-RELEASE if possible
2008-11-29 14:32:14 +00:00
|
|
|
|
2009-05-27 14:30:26 +00:00
|
|
|
p = strrchr(name, '.');
|
|
|
|
if (strncmp(p ? p + 1 : name, "no", 2))
|
|
|
|
return NULL;
|
|
|
|
nname = malloc(strlen(name) - 1);
|
|
|
|
if (nname == NULL)
|
|
|
|
err(1, "malloc");
|
|
|
|
if (p != NULL)
|
|
|
|
sprintf(nname, "%.*s.%s", (int)(p - name), name, p + 3);
|
|
|
|
else
|
|
|
|
strcpy(nname, name + 2);
|
|
|
|
return nname;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
print_jail(int pflags, int jflags)
|
|
|
|
{
|
|
|
|
char *nname;
|
2009-06-24 18:18:35 +00:00
|
|
|
char **param_values;
|
|
|
|
int i, ai, jid, count, spc;
|
2009-05-27 14:30:26 +00:00
|
|
|
char ipbuf[INET6_ADDRSTRLEN];
|
|
|
|
|
2009-06-24 18:18:35 +00:00
|
|
|
jid = jailparam_get(params, nparams, jflags);
|
|
|
|
if (jid < 0)
|
|
|
|
return jid;
|
2009-05-27 14:30:26 +00:00
|
|
|
if (pflags & PRINT_VERBOSE) {
|
|
|
|
printf("%6d %-29.29s %.74s\n"
|
|
|
|
"%6s %-29.29s %.74s\n"
|
|
|
|
"%6s %-6d\n",
|
2009-06-24 18:18:35 +00:00
|
|
|
*(int *)params[0].jp_value,
|
|
|
|
(char *)params[1].jp_value,
|
|
|
|
(char *)params[2].jp_value,
|
2009-05-27 14:30:26 +00:00
|
|
|
"",
|
2009-06-24 18:18:35 +00:00
|
|
|
(char *)params[3].jp_value,
|
|
|
|
*(int *)params[4].jp_value ? "DYING" : "ACTIVE",
|
2009-05-27 14:30:26 +00:00
|
|
|
"",
|
2009-06-24 18:18:35 +00:00
|
|
|
*(int *)params[5].jp_value);
|
|
|
|
count = params[6].jp_valuelen / sizeof(struct in_addr);
|
2009-05-27 14:30:26 +00:00
|
|
|
for (ai = 0; ai < count; ai++)
|
|
|
|
if (inet_ntop(AF_INET,
|
2009-06-24 18:18:35 +00:00
|
|
|
&((struct in_addr *)params[6].jp_value)[ai],
|
2009-05-27 14:30:26 +00:00
|
|
|
ipbuf, sizeof(ipbuf)) == NULL)
|
|
|
|
err(1, "inet_ntop");
|
|
|
|
else
|
|
|
|
printf("%6s %-15.15s\n", "", ipbuf);
|
2009-06-24 18:18:35 +00:00
|
|
|
if (!strcmp(params[7].jp_name, "ip6.addr")) {
|
|
|
|
count = params[7].jp_valuelen / sizeof(struct in6_addr);
|
2009-05-27 14:30:26 +00:00
|
|
|
for (ai = 0; ai < count; ai++)
|
2009-06-24 18:18:35 +00:00
|
|
|
if (inet_ntop(AF_INET6,
|
|
|
|
&((struct in_addr *)params[7].jp_value)[ai],
|
2009-05-27 14:30:26 +00:00
|
|
|
ipbuf, sizeof(ipbuf)) == NULL)
|
|
|
|
err(1, "inet_ntop");
|
|
|
|
else
|
|
|
|
printf("%6s %-15.15s\n", "", ipbuf);
|
MFp4:
Bring in updated jail support from bz_jail branch.
This enhances the current jail implementation to permit multiple
addresses per jail. In addtion to IPv4, IPv6 is supported as well.
Due to updated checks it is even possible to have jails without
an IP address at all, which basically gives one a chroot with
restricted process view, no networking,..
SCTP support was updated and supports IPv6 in jails as well.
Cpuset support permits jails to be bound to specific processor
sets after creation.
Jails can have an unrestricted (no duplicate protection, etc.) name
in addition to the hostname. The jail name cannot be changed from
within a jail and is considered to be used for management purposes
or as audit-token in the future.
DDB 'show jails' command was added to aid debugging.
Proper compat support permits 32bit jail binaries to be used on 64bit
systems to manage jails. Also backward compatibility was preserved where
possible: for jail v1 syscalls, as well as with user space management
utilities.
Both jail as well as prison version were updated for the new features.
A gap was intentionally left as the intermediate versions had been
used by various patches floating around the last years.
Bump __FreeBSD_version for the afore mentioned and in kernel changes.
Special thanks to:
- Pawel Jakub Dawidek (pjd) for his multi-IPv4 patches
and Olivier Houchard (cognet) for initial single-IPv6 patches.
- Jeff Roberson (jeff) and Randall Stewart (rrs) for their
help, ideas and review on cpuset and SCTP support.
- Robert Watson (rwatson) for lots and lots of help, discussions,
suggestions and review of most of the patch at various stages.
- John Baldwin (jhb) for his help.
- Simon L. Nielsen (simon) as early adopter testing changes
on cluster machines as well as all the testers and people
who provided feedback the last months on freebsd-jail and
other channels.
- My employer, CK Software GmbH, for the support so I could work on this.
Reviewed by: (see above)
MFC after: 3 months (this is just so that I get the mail)
X-MFC Before: 7.2-RELEASE if possible
2008-11-29 14:32:14 +00:00
|
|
|
}
|
2009-05-27 14:30:26 +00:00
|
|
|
} else if (pflags & PRINT_DEFAULT)
|
|
|
|
printf("%6d %-15.15s %-29.29s %.74s\n",
|
2009-06-24 18:18:35 +00:00
|
|
|
*(int *)params[0].jp_value,
|
|
|
|
params[1].jp_valuelen == 0 ? "-"
|
|
|
|
: inet_ntoa(*(struct in_addr *)params[1].jp_value),
|
|
|
|
(char *)params[2].jp_value,
|
|
|
|
(char *)params[3].jp_value);
|
2009-05-27 14:30:26 +00:00
|
|
|
else {
|
2009-06-24 18:18:35 +00:00
|
|
|
param_values = alloca(nparams * sizeof(*param_values));
|
|
|
|
for (i = 0; i < nparams; i++) {
|
|
|
|
if (!(params[i].jp_flags & JP_USER))
|
|
|
|
continue;
|
|
|
|
param_values[i] = jailparam_export(params + i);
|
|
|
|
if (param_values[i] == NULL)
|
|
|
|
errx(1, "%s", jail_errmsg);
|
|
|
|
}
|
2009-05-27 14:30:26 +00:00
|
|
|
for (i = spc = 0; i < nparams; i++) {
|
2009-06-24 18:18:35 +00:00
|
|
|
if (!(params[i].jp_flags & JP_USER))
|
2009-05-27 14:30:26 +00:00
|
|
|
continue;
|
|
|
|
if ((pflags & PRINT_SKIP) &&
|
2009-06-24 18:18:35 +00:00
|
|
|
((!(params[i].jp_ctltype &
|
|
|
|
(CTLFLAG_WR | CTLFLAG_TUN))) ||
|
|
|
|
(param_noparent[i] >= 0 &&
|
|
|
|
*(int *)params[param_noparent[i]].jp_value)))
|
2009-05-27 14:30:26 +00:00
|
|
|
continue;
|
|
|
|
if (spc)
|
|
|
|
putchar(' ');
|
|
|
|
else
|
|
|
|
spc = 1;
|
|
|
|
if (pflags & PRINT_NAMEVAL) {
|
|
|
|
/*
|
|
|
|
* Generally "name=value", but for booleans
|
|
|
|
* either "name" or "noname".
|
|
|
|
*/
|
2009-06-24 18:18:35 +00:00
|
|
|
if (params[i].jp_flags &
|
|
|
|
(JP_BOOL | JP_NOBOOL)) {
|
|
|
|
if (*(int *)params[i].jp_value)
|
|
|
|
printf("%s", params[i].jp_name);
|
2009-05-27 14:30:26 +00:00
|
|
|
else {
|
2009-06-24 18:18:35 +00:00
|
|
|
nname = (params[i].jp_flags &
|
|
|
|
JP_NOBOOL) ?
|
|
|
|
nononame(params[i].jp_name)
|
|
|
|
: noname(params[i].jp_name);
|
2009-05-27 14:30:26 +00:00
|
|
|
printf("%s", nname);
|
|
|
|
free(nname);
|
|
|
|
}
|
2009-06-24 18:18:35 +00:00
|
|
|
continue;
|
2009-05-27 14:30:26 +00:00
|
|
|
}
|
2009-06-24 18:18:35 +00:00
|
|
|
printf("%s=", params[i].jp_name);
|
2009-05-27 14:30:26 +00:00
|
|
|
}
|
2009-06-24 18:18:35 +00:00
|
|
|
if (params[i].jp_valuelen == 0) {
|
2009-05-27 14:30:26 +00:00
|
|
|
if (pflags & PRINT_QUOTED)
|
|
|
|
printf("\"\"");
|
|
|
|
else if (!(pflags & PRINT_NAMEVAL))
|
|
|
|
putchar('-');
|
2009-06-24 18:18:35 +00:00
|
|
|
} else
|
|
|
|
quoted_print(param_values[i]);
|
2009-05-27 14:30:26 +00:00
|
|
|
}
|
|
|
|
putchar('\n');
|
2009-06-24 18:18:35 +00:00
|
|
|
for (i = 0; i < nparams; i++)
|
|
|
|
if (params[i].jp_flags & JP_USER)
|
|
|
|
free(param_values[i]);
|
2003-04-09 03:04:12 +00:00
|
|
|
}
|
2009-05-27 14:30:26 +00:00
|
|
|
for (i = 0; i < nparams; i++)
|
2009-06-24 18:18:35 +00:00
|
|
|
if (!(params[i].jp_flags & JP_RAWVALUE)) {
|
|
|
|
free(params[i].jp_value);
|
|
|
|
params[i].jp_value = NULL;
|
|
|
|
}
|
2009-05-27 14:30:26 +00:00
|
|
|
return (jid);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2009-06-24 18:18:35 +00:00
|
|
|
quoted_print(char *str)
|
2009-05-27 14:30:26 +00:00
|
|
|
{
|
|
|
|
int c, qc;
|
|
|
|
char *p = str;
|
MFp4:
Bring in updated jail support from bz_jail branch.
This enhances the current jail implementation to permit multiple
addresses per jail. In addtion to IPv4, IPv6 is supported as well.
Due to updated checks it is even possible to have jails without
an IP address at all, which basically gives one a chroot with
restricted process view, no networking,..
SCTP support was updated and supports IPv6 in jails as well.
Cpuset support permits jails to be bound to specific processor
sets after creation.
Jails can have an unrestricted (no duplicate protection, etc.) name
in addition to the hostname. The jail name cannot be changed from
within a jail and is considered to be used for management purposes
or as audit-token in the future.
DDB 'show jails' command was added to aid debugging.
Proper compat support permits 32bit jail binaries to be used on 64bit
systems to manage jails. Also backward compatibility was preserved where
possible: for jail v1 syscalls, as well as with user space management
utilities.
Both jail as well as prison version were updated for the new features.
A gap was intentionally left as the intermediate versions had been
used by various patches floating around the last years.
Bump __FreeBSD_version for the afore mentioned and in kernel changes.
Special thanks to:
- Pawel Jakub Dawidek (pjd) for his multi-IPv4 patches
and Olivier Houchard (cognet) for initial single-IPv6 patches.
- Jeff Roberson (jeff) and Randall Stewart (rrs) for their
help, ideas and review on cpuset and SCTP support.
- Robert Watson (rwatson) for lots and lots of help, discussions,
suggestions and review of most of the patch at various stages.
- John Baldwin (jhb) for his help.
- Simon L. Nielsen (simon) as early adopter testing changes
on cluster machines as well as all the testers and people
who provided feedback the last months on freebsd-jail and
other channels.
- My employer, CK Software GmbH, for the support so I could work on this.
Reviewed by: (see above)
MFC after: 3 months (this is just so that I get the mail)
X-MFC Before: 7.2-RELEASE if possible
2008-11-29 14:32:14 +00:00
|
|
|
|
2009-05-27 14:30:26 +00:00
|
|
|
/* An empty string needs quoting. */
|
|
|
|
if (!*p) {
|
|
|
|
fputs("\"\"", stdout);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* The value will be surrounded by quotes if it contains spaces
|
|
|
|
* or quotes.
|
|
|
|
*/
|
|
|
|
qc = strchr(p, '\'') ? '"'
|
|
|
|
: strchr(p, '"') ? '\''
|
|
|
|
: strchr(p, ' ') || strchr(p, '\t') ? '"'
|
|
|
|
: 0;
|
|
|
|
if (qc)
|
|
|
|
putchar(qc);
|
2009-06-24 18:18:35 +00:00
|
|
|
while ((c = *p++)) {
|
2009-05-27 14:30:26 +00:00
|
|
|
if (c == '\\' || c == qc)
|
|
|
|
putchar('\\');
|
|
|
|
putchar(c);
|
|
|
|
}
|
|
|
|
if (qc)
|
|
|
|
putchar(qc);
|
2003-04-09 03:04:12 +00:00
|
|
|
}
|