OpenAFS Master Repository branch, master, updated. BP--openafs-stable-1_6_x-113-g94aa0f0

Sun, 19 Sep 2010 23:48:43 -0700 (PDT)

The following commit has been merged in the master branch:
commit 94aa0f0860653ca4431ed1a6adaee10ef731be21
Author: Simon Wilkinson <sxw@your-file-system.com>
Date:   Thu Sep 16 07:09:20 2010 +0100

    Rename kauth/token.c as kauth/katoken.c
    
    The kauth 'token.c' collides with the same file in auth when doing
    Windows builds. As kauth is the legacy package, rename its source
    file, and update the build system to take account of this.
    
    Change-Id: Ib99ef6674a4bfd6a2810b417b34bdc564b3533dc
    Reviewed-on: http://gerrit.openafs.org/2766
    Tested-by: BuildBot <buildbot@rampaginggeek.com>
    Reviewed-by: Derrick Brashear <shadow@dementia.org>
    Tested-by: Derrick Brashear <shadow@dementia.org>

 src/kauth/Makefile.in           |    8 +-
 src/kauth/NTMakefile            |    4 +-
 src/kauth/katoken.c             |  337 +++++++++++++++++++++++++++++++++++++++
 src/kauth/token.c               |  337 ---------------------------------------
 src/libafsauthent/Makefile.in   |    4 +-
 src/libafsauthent/NTMakefile    |    4 +-
 src/libuafs/Makefile.common.in  |   12 +-
 src/shlibafsauthent/Makefile.in |    4 +-
 8 files changed, 355 insertions(+), 355 deletions(-)

-- 
OpenAFS Master Repository