Deleted Added
full compact
priv_vfs_extattr_system.c (172106) priv_vfs_extattr_system.c (196172)
1/*-
2 * Copyright (c) 2006 nCircle Network Security, Inc.
3 * Copyright (c) 2007 Robert N. M. Watson
4 * All rights reserved.
5 *
6 * This software was developed by Robert N. M. Watson for the TrustedBSD
7 * Project under contract to nCircle Network Security, Inc.
8 *

--- 13 unchanged lines hidden (view full) ---

22 * INC., OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
23 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
24 * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
25 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
26 * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
27 * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
28 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
29 *
1/*-
2 * Copyright (c) 2006 nCircle Network Security, Inc.
3 * Copyright (c) 2007 Robert N. M. Watson
4 * All rights reserved.
5 *
6 * This software was developed by Robert N. M. Watson for the TrustedBSD
7 * Project under contract to nCircle Network Security, Inc.
8 *

--- 13 unchanged lines hidden (view full) ---

22 * INC., OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
23 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
24 * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
25 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
26 * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
27 * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
28 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
29 *
30 * $FreeBSD: head/tools/regression/priv/priv_vfs_extattr_system.c 172106 2007-09-09 23:08:39Z rwatson $
30 * $FreeBSD: head/tools/regression/priv/priv_vfs_extattr_system.c 196172 2009-08-13 09:11:47Z bz $
31 */
32
33/*
34 * Test that privilege is required to write to the system extended attribute
35 * namespace.
36 */
37
38#include <sys/types.h>

--- 36 unchanged lines hidden (view full) ---

75
76 ret = extattr_set_file(fpath, EA_NAMESPACE, EA_NAME, EA_DATA,
77 EA_SIZE);
78 if (ret < 0)
79 error = -1;
80 else if (ret == EA_SIZE)
81 error = 0;
82 else
31 */
32
33/*
34 * Test that privilege is required to write to the system extended attribute
35 * namespace.
36 */
37
38#include <sys/types.h>

--- 36 unchanged lines hidden (view full) ---

75
76 ret = extattr_set_file(fpath, EA_NAMESPACE, EA_NAME, EA_DATA,
77 EA_SIZE);
78 if (ret < 0)
79 error = -1;
80 else if (ret == EA_SIZE)
81 error = 0;
82 else
83 err(-1, "priv_vfs_extattr_system: set returned %d", ret);
83 err(-1, "priv_vfs_extattr_system: set returned %zd", ret);
84 if (asroot && injail)
85 expect("priv_vfs_extattr_system(asroot, injail)", error, -1,
86 EPERM);
87 if (asroot && !injail)
88 expect("priv_vfs_extattr_system(asroot, !injail)", error, 0,
89 0);
90 if (!asroot && injail)
91 expect("priv_vfs_extattr_system(!asroot, injail)", error, -1,

--- 15 unchanged lines hidden ---
84 if (asroot && injail)
85 expect("priv_vfs_extattr_system(asroot, injail)", error, -1,
86 EPERM);
87 if (asroot && !injail)
88 expect("priv_vfs_extattr_system(asroot, !injail)", error, 0,
89 0);
90 if (!asroot && injail)
91 expect("priv_vfs_extattr_system(!asroot, injail)", error, -1,

--- 15 unchanged lines hidden ---