28c28
< __FBSDID("$FreeBSD: stable/10/usr.sbin/jail/command.c 276277 2014-12-27 02:17:35Z jamie $");
---
> __FBSDID("$FreeBSD: stable/10/usr.sbin/jail/command.c 278484 2015-02-10 01:05:51Z jamie $");
114a115,120
> break;
> case IP_MOUNT_PROCFS:
> if (!bool_param(j->intparams[IP_MOUNT_PROCFS]))
> continue;
> j->comstring = &dummystring;
> break;
531a538,563
> case IP_MOUNT_PROCFS:
> argv = alloca(7 * sizeof(char *));
> path = string_param(j->intparams[KP_PATH]);
> if (path == NULL) {
> jail_warnx(j, "mount.procfs: no path");
> return -1;
> }
> devpath = alloca(strlen(path) + 6);
> sprintf(devpath, "%s/proc", path);
> if (check_path(j, "mount.procfs", devpath, 0,
> down ? "procfs" : NULL) < 0)
> return -1;
> if (down) {
> *(const char **)&argv[0] = "/sbin/umount";
> argv[1] = devpath;
> argv[2] = NULL;
> } else {
> *(const char **)&argv[0] = _PATH_MOUNT;
> *(const char **)&argv[1] = "-t";
> *(const char **)&argv[2] = "procfs";
> *(const char **)&argv[3] = ".";
> argv[4] = devpath;
> argv[5] = NULL;
> }
> break;
>