From 45916cd2fec6e79bca5dee0421bd39e3c2910d1e Mon Sep 17 00:00:00 2001 From: jpk Date: Fri, 24 Mar 2006 12:29:20 -0800 Subject: PSARC/2002/762 Layered Trusted Solaris PSARC/2005/060 TSNET: Trusted Networking with Security Labels PSARC/2005/259 Layered Trusted Solaris Label Interfaces PSARC/2005/573 Solaris Trusted Extensions for Printing PSARC/2005/691 Trusted Extensions for Device Allocation PSARC/2005/723 Solaris Trusted Extensions Filesystem Labeling PSARC/2006/009 Labeled Auditing PSARC/2006/155 Trusted Extensions RBAC Changes PSARC/2006/191 is_system_labeled 6293271 Zone processes should use zone_kcred instead of kcred 6394554 integrate Solaris Trusted Extensions --HG-- rename : usr/src/cmd/dminfo/Makefile => deleted_files/usr/src/cmd/dminfo/Makefile rename : usr/src/cmd/dminfo/dminfo.c => usr/src/cmd/allocate/dminfo.c --- usr/src/lib/libc/port/sys/zone.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'usr/src/lib/libc/port/sys/zone.c') diff --git a/usr/src/lib/libc/port/sys/zone.c b/usr/src/lib/libc/port/sys/zone.c index fc852c4dd5..12e34c0de6 100644 --- a/usr/src/lib/libc/port/sys/zone.c +++ b/usr/src/lib/libc/port/sys/zone.c @@ -2,9 +2,8 @@ * CDDL HEADER START * * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * Common Development and Distribution License (the "License"). + * You may not use this file except in compliance with the License. * * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE * or http://www.opensolaris.org/os/licensing. @@ -20,7 +19,7 @@ * CDDL HEADER END */ /* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -37,14 +36,15 @@ #include #include #include +#include #include #include #include -extern zoneid_t +zoneid_t zone_create(const char *name, const char *root, const struct priv_set *privs, const char *rctls, size_t rctlsz, const char *zfs, size_t zfssz, - int *extended_error) + int *extended_error, int match, int doi, const bslabel_t *label) { zone_def zd; priv_data_t *d; @@ -60,6 +60,9 @@ zone_create(const char *name, const char *root, const struct priv_set *privs, zd.zfsbuf = zfs; zd.zfsbufsz = zfssz; zd.extended_error = extended_error; + zd.match = match; + zd.doi = doi; + zd.label = label; return ((zoneid_t)syscall(SYS_zone, ZONE_CREATE, &zd)); } -- cgit v1.2.3