cvs commit: src/sys/security/mac mac_framework.h mac_inet.c mac_policy.h src/sys/security/mac_biba mac_biba.c src/sys/security/mac_lomac mac_lomac.c src/sys/security/mac_mls mac_mls.c src/sys/security/mac_stub mac_stub.c ...

[Robert Watson]

rwatson     2008-08-04 08:50:16 UTC

  FreeBSD src repository

  Modified files:        (Branch: RELENG_7)
    sys/security/mac     mac_framework.h mac_inet.c mac_policy.h 
    sys/security/mac_biba mac_biba.c 
    sys/security/mac_lomac mac_lomac.c 
    sys/security/mac_mls mac_mls.c 
    sys/security/mac_stub mac_stub.c 
    sys/security/mac_test mac_test.c 
  Log:
  SVN rev 181285 on 2008-08-04 08:50:16Z by rwatson
  
  Merge r179781 from head to stable/7:
  
    The TrustedBSD MAC Framework named struct ipq instances 'ipq', which is the
    same as the global variable defined in ip_input.c.  Instead, adopt the name
    'q' as found in about 1/2 of uses in ip_input.c, preventing a collision on
    the name.  This is non-harmful, but means that search and replace on the
    global works less well (as in the virtualization work), as well as indexing
    tools.
  
    Reported by:    julian
  
  Revision   Changes    Path
  1.84.2.3   +4 -4      src/sys/security/mac/mac_framework.h
  1.11.2.4   +14 -14    src/sys/security/mac/mac_inet.c
  1.94.2.3   +3 -3      src/sys/security/mac/mac_policy.h
  1.107.2.3  +10 -10    src/sys/security/mac_biba/mac_biba.c
  1.53.2.2   +10 -10    src/sys/security/mac_lomac/mac_lomac.c
  1.88.2.4   +10 -10    src/sys/security/mac_mls/mac_mls.c
  1.68.2.3   +7 -7      src/sys/security/mac_stub/mac_stub.c
  1.78.2.4   +8 -8      src/sys/security/mac_test/mac_test.c