2c2
< * Copyright (c) 1999-2002 Robert N. M. Watson
---
> * Copyright (c) 1999-2002, 2007 Robert N. M. Watson
34c34
< * $FreeBSD: head/sys/security/mac_test/mac_test.c 166531 2007-02-06 10:59:23Z rwatson $
---
> * $FreeBSD: head/sys/security/mac_test/mac_test.c 166533 2007-02-06 14:19:25Z rwatson $
105c105,106
< #define SLOT(x) LABEL_TO_SLOT((x), test_slot).l_long
---
> #define SLOT(x) mac_label_get((x), test_slot)
> #define SLOT_SET(x, v) mac_label_set((x), test_slot, (v))
308c309
< SLOT(label) = BPFMAGIC;
---
> SLOT_SET(label, BPFMAGIC);
316c317
< SLOT(label) = CREDMAGIC;
---
> SLOT_SET(label, CREDMAGIC);
324c325
< SLOT(label) = DEVFSMAGIC;
---
> SLOT_SET(label, DEVFSMAGIC);
332c333
< SLOT(label) = IFNETMAGIC;
---
> SLOT_SET(label, IFNETMAGIC);
345c346
< SLOT(label) = INPCBMAGIC;
---
> SLOT_SET(label, INPCBMAGIC);
353c354
< SLOT(label) = SYSVIPCMSGMAGIC;
---
> SLOT_SET(label, SYSVIPCMSGMAGIC);
360c361
< SLOT(label) = SYSVIPCMSQMAGIC;
---
> SLOT_SET(label, SYSVIPCMSQMAGIC);
367c368
< SLOT(label) = SYSVIPCSEMMAGIC;
---
> SLOT_SET(label, SYSVIPCSEMMAGIC);
374c375
< SLOT(label) = SYSVIPCSHMMAGIC;
---
> SLOT_SET(label, SYSVIPCSHMMAGIC);
387c388
< SLOT(label) = IPQMAGIC;
---
> SLOT_SET(label, IPQMAGIC);
401c402
< SLOT(label) = MBUFMAGIC;
---
> SLOT_SET(label, MBUFMAGIC);
410c411
< SLOT(label) = MOUNTMAGIC;
---
> SLOT_SET(label, MOUNTMAGIC);
418c419
< SLOT(label) = MOUNTMAGIC;
---
> SLOT_SET(label, MOUNTMAGIC);
431c432
< SLOT(label) = SOCKETMAGIC;
---
> SLOT_SET(label, SOCKETMAGIC);
445c446
< SLOT(label) = SOCKETMAGIC;
---
> SLOT_SET(label, SOCKETMAGIC);
454c455
< SLOT(label) = PIPEMAGIC;
---
> SLOT_SET(label, PIPEMAGIC);
462c463
< SLOT(label) = POSIXSEMMAGIC;
---
> SLOT_SET(label, POSIXSEMMAGIC);
470c471
< SLOT(label) = PROCMAGIC;
---
> SLOT_SET(label, PROCMAGIC);
478c479
< SLOT(label) = VNODEMAGIC;
---
> SLOT_SET(label, VNODEMAGIC);
488c489
< SLOT(label) = EXMAGIC;
---
> SLOT_SET(label, EXMAGIC);
502c503
< SLOT(label) = EXMAGIC;
---
> SLOT_SET(label, EXMAGIC);
516c517
< SLOT(label) = EXMAGIC;
---
> SLOT_SET(label, EXMAGIC);
530c531
< SLOT(label) = EXMAGIC;
---
> SLOT_SET(label, EXMAGIC);
544c545
< SLOT(label) = EXMAGIC;
---
> SLOT_SET(label, EXMAGIC);
558c559
< SLOT(label) = EXMAGIC;
---
> SLOT_SET(label, EXMAGIC);
573c574
< SLOT(label) = EXMAGIC;
---
> SLOT_SET(label, EXMAGIC);
588c589
< SLOT(label) = EXMAGIC;
---
> SLOT_SET(label, EXMAGIC);
602c603
< SLOT(label) = EXMAGIC;
---
> SLOT_SET(label, EXMAGIC);
616c617
< SLOT(label) = EXMAGIC;
---
> SLOT_SET(label, EXMAGIC);
638c639
< SLOT(label) = EXMAGIC;
---
> SLOT_SET(label, EXMAGIC);
652c653
< SLOT(label) = EXMAGIC;
---
> SLOT_SET(label, EXMAGIC);
666c667
< SLOT(label) = EXMAGIC;
---
> SLOT_SET(label, EXMAGIC);
680c681
< SLOT(label) = EXMAGIC;
---
> SLOT_SET(label, EXMAGIC);
694c695
< SLOT(label) = EXMAGIC;
---
> SLOT_SET(label, EXMAGIC);
708c709
< SLOT(label) = EXMAGIC;
---
> SLOT_SET(label, EXMAGIC);
722c723
< SLOT(label) = EXMAGIC;
---
> SLOT_SET(label, EXMAGIC);
736c737
< SLOT(label) = EXMAGIC;
---
> SLOT_SET(label, EXMAGIC);
750c751
< SLOT(label) = EXMAGIC;
---
> SLOT_SET(label, EXMAGIC);