OpenAFS Master Repository branch, openafs-stable-1_6_x, updated. openafs-stable-1_6_2pre2-10-g9754a28

Gerrit Code Review
Thu, 10 Jan 2013 08:04:57 -0800 (PST)

The following commit has been merged in the openafs-stable-1_6_x branch:
commit 5be413b079dfceae7b6881913c14a67561907db7
Author: Andrew Deason <>
Date:   Fri Jan 4 13:47:35 2013 -0500

    SOLARIS: Avoid areq and auid conflict
    On new Solaris (11.1), nfs/auth.h #defines areq and auid to access
    some elements inside the nfsauth_arg structure more easily. We have a
    lot of functions that use those names as parameters, so the compiler
    throws an error (since we have a decl like "struct vrequest
    We cannot avoid including that header, since we need some NFS-related
    headers for the NFS xlator, and they pull in nfs/auth.h
    unconditionally. So, work around this by undefining areq and auid
    Tested-by: BuildBot <>
    Reviewed-by: Derrick Brashear <>
    (cherry picked from commit 936c2b02bf6fbeb3844c539665392ae89eb652fe)
    Change-Id: I54da96a48d163b6aa57bb8525ff4c80f10d70fa1
    Tested-by: BuildBot <>
    Reviewed-by: Andrew Deason <>
    Reviewed-by: Paul Smeddle <>
    Reviewed-by: Stephan Wiesand <>

 src/afs/afs_nfsdisp.c |   12 ++++++++++++
 1 files changed, 12 insertions(+), 0 deletions(-)

OpenAFS Master Repository