cvs commit: src/sys/kern sysv_shm.c

[Robert Watson]

rwatson     2006-07-24 23:41:38 UTC

  FreeBSD src repository

  Modified files:        (Branch: RELENG_6)
    sys/kern             sysv_shm.c 
  Log:
  Merge sysv_shm.c:1.104 from HEAD to RELENG_6:
  
    Re-order MAC and DAC checks in shmget() in order to give precedence to
    the MAC result, as well as avoid losing the DAC check result when MAC
    is enabled.
  
    Reported by:    Patrick LeBlanc <Patrick dot LeBlanc at sparta dot com>
  
  Reminded by:    shangjie dot li at gmail dot com
  
  Revision   Changes    Path
  1.102.2.2  +4 -2      src/sys/kern/sysv_shm.c