Deleted Added
full compact
mac_internal.h (121490) mac_internal.h (121507)
1/*-
2 * Copyright (c) 1999, 2000, 2001, 2002 Robert N. M. Watson
3 * Copyright (c) 2001 Ilmar S. Habibulin
4 * Copyright (c) 2001, 2002, 2003 Networks Associates Technology, Inc.
5 * All rights reserved.
6 *
7 * This software was developed by Robert Watson and Ilmar Habibulin for the
8 * TrustedBSD Project.

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

28 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
29 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
30 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
31 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
32 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
33 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
34 * SUCH DAMAGE.
35 *
1/*-
2 * Copyright (c) 1999, 2000, 2001, 2002 Robert N. M. Watson
3 * Copyright (c) 2001 Ilmar S. Habibulin
4 * Copyright (c) 2001, 2002, 2003 Networks Associates Technology, Inc.
5 * All rights reserved.
6 *
7 * This software was developed by Robert Watson and Ilmar Habibulin for the
8 * TrustedBSD Project.

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

28 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
29 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
30 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
31 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
32 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
33 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
34 * SUCH DAMAGE.
35 *
36 * $FreeBSD: head/sys/security/mac/mac_internal.h 121490 2003-10-25 03:50:44Z rwatson $
36 * $FreeBSD: head/sys/security/mac/mac_internal.h 121507 2003-10-25 15:28:20Z rwatson $
37 */
38
39/*
40 * MAC Framework sysctl namespace.
41 */
42SYSCTL_DECL(_security);
43SYSCTL_DECL(_security_mac);
44#ifdef MAC_DEBUG

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

197 error = sbuf_printf(&sb, "%s/", element_name); \
198 else \
199 error = sbuf_printf(&sb, ",%s/", element_name); \
200 if (error == -1) { \
201 error = EINVAL; /* XXX: E2BIG? */ \
202 break; \
203 } \
204 claimed = 0; \
37 */
38
39/*
40 * MAC Framework sysctl namespace.
41 */
42SYSCTL_DECL(_security);
43SYSCTL_DECL(_security_mac);
44#ifdef MAC_DEBUG

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

197 error = sbuf_printf(&sb, "%s/", element_name); \
198 else \
199 error = sbuf_printf(&sb, ",%s/", element_name); \
200 if (error == -1) { \
201 error = EINVAL; /* XXX: E2BIG? */ \
202 break; \
203 } \
204 claimed = 0; \
205 MAC_CHECK(externalize_ ## type, label, element_name, \
206 &sb, &claimed); \
205 MAC_CHECK(externalize_ ## type ## _label, label, \
206 element_name, &sb, &claimed); \
207 if (error) \
208 break; \
209 if (claimed == 0 && ignorenotfound) { \
210 /* Revert last label name. */ \
211 sbuf_setpos(&sb, savedlen); \
212 } else if (claimed != 1) { \
213 error = EINVAL; /* XXX: ENOLABEL? */ \
214 break; \

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

228 while ((element_name = strsep(&element, ",")) != NULL) { \
229 element_data = element_name; \
230 element_name = strsep(&element_data, "/"); \
231 if (element_data == NULL) { \
232 error = EINVAL; \
233 break; \
234 } \
235 claimed = 0; \
207 if (error) \
208 break; \
209 if (claimed == 0 && ignorenotfound) { \
210 /* Revert last label name. */ \
211 sbuf_setpos(&sb, savedlen); \
212 } else if (claimed != 1) { \
213 error = EINVAL; /* XXX: ENOLABEL? */ \
214 break; \

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

228 while ((element_name = strsep(&element, ",")) != NULL) { \
229 element_data = element_name; \
230 element_name = strsep(&element_data, "/"); \
231 if (element_data == NULL) { \
232 error = EINVAL; \
233 break; \
234 } \
235 claimed = 0; \
236 MAC_CHECK(internalize_ ## type, label, element_name, \
237 element_data, &claimed); \
236 MAC_CHECK(internalize_ ## type ## _label, label, \
237 element_name, element_data, &claimed); \
238 if (error) \
239 break; \
240 if (claimed != 1) { \
241 /* XXXMAC: Another error here? */ \
242 error = EINVAL; \
243 break; \
244 } \
245 } \

--- 22 unchanged lines hidden ---
238 if (error) \
239 break; \
240 if (claimed != 1) { \
241 /* XXXMAC: Another error here? */ \
242 error = EINVAL; \
243 break; \
244 } \
245 } \

--- 22 unchanged lines hidden ---