| command.c (234712) | command.c (234988) |
|---|---|
| 1/*- 2 * Copyright (c) 2011 James Gritton 3 * All rights reserved. 4 * 5 * Redistribution and use in source and binary forms, with or without 6 * modification, are permitted provided that the following conditions 7 * are met: 8 * 1. Redistributions of source code must retain the above copyright --- 11 unchanged lines hidden (view full) --- 20 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 21 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 22 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 23 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 24 * SUCH DAMAGE. 25 */ 26 27#include <sys/cdefs.h> | 1/*- 2 * Copyright (c) 2011 James Gritton 3 * All rights reserved. 4 * 5 * Redistribution and use in source and binary forms, with or without 6 * modification, are permitted provided that the following conditions 7 * are met: 8 * 1. Redistributions of source code must retain the above copyright --- 11 unchanged lines hidden (view full) --- 20 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 21 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 22 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 23 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 24 * SUCH DAMAGE. 25 */ 26 27#include <sys/cdefs.h> |
| 28__FBSDID("$FreeBSD: head/usr.sbin/jail/command.c 234712 2012-04-26 17:36:05Z jamie $"); | 28__FBSDID("$FreeBSD: head/usr.sbin/jail/command.c 234988 2012-05-03 21:39:23Z jamie $"); |
| 29 30#include <sys/types.h> 31#include <sys/event.h> 32#include <sys/mount.h> 33#include <sys/stat.h> 34#include <sys/sysctl.h> 35#include <sys/user.h> 36#include <sys/wait.h> --- 58 unchanged lines hidden (view full) --- 95 return 1; 96 } 97 create_failed = (j->flags & (JF_STOP | JF_FAILED)) == JF_FAILED; 98 comparam = *j->comparam; 99 for (;;) { 100 if (j->comstring == NULL) { 101 j->comparam += create_failed ? -1 : 1; 102 switch ((comparam = *j->comparam)) { | 29 30#include <sys/types.h> 31#include <sys/event.h> 32#include <sys/mount.h> 33#include <sys/stat.h> 34#include <sys/sysctl.h> 35#include <sys/user.h> 36#include <sys/wait.h> --- 58 unchanged lines hidden (view full) --- 95 return 1; 96 } 97 create_failed = (j->flags & (JF_STOP | JF_FAILED)) == JF_FAILED; 98 comparam = *j->comparam; 99 for (;;) { 100 if (j->comstring == NULL) { 101 j->comparam += create_failed ? -1 : 1; 102 switch ((comparam = *j->comparam)) { |
| 103 case 0: | 103 case IP__NULL: |
| 104 return 0; 105 case IP_MOUNT_DEVFS: 106 if (!bool_param(j->intparams[IP_MOUNT_DEVFS])) 107 continue; 108 /* FALLTHROUGH */ 109 case IP__OP: 110 case IP_STOP_TIMEOUT: 111 j->comstring = &dummystring; --- 746 unchanged lines hidden --- | 104 return 0; 105 case IP_MOUNT_DEVFS: 106 if (!bool_param(j->intparams[IP_MOUNT_DEVFS])) 107 continue; 108 /* FALLTHROUGH */ 109 case IP__OP: 110 case IP_STOP_TIMEOUT: 111 j->comstring = &dummystring; --- 746 unchanged lines hidden --- |