OpenAFS Master Repository branch, master, updated. BP--openafs-stable-1_6_x-668-g6f39035

[Gerrit Code Review]

The following commit has been merged in the master branch:
commit 6f39035c92713b08065bee28ffdf06c5fe32a971
Author: Derrick Brashear <shadow@dementia.org>
Date:   Wed Jan 19 22:56:12 2011 -0500

    MacOS: don't allow krb5 at login when AD plugin authenticates
    
    if AD is being used to verify authentication (e.g. via builtin)
    don't allow get krb5 at login to succeed. since a helper does this we can't
    grey the option, but we can decline to act on it.
    
    Change-Id: I1f2bb891377c3ed9765f9e58141c77ec54d3ae22
    Reviewed-on: http://gerrit.openafs.org/3690
    Reviewed-by: Derrick Brashear <shadow@dementia.org>
    Tested-by: Derrick Brashear <shadow@dementia.org>
    Tested-by: BuildBot <buildbot@rampaginggeek.com>

 src/platform/DARWIN/AFSPreference/PListManager.m |   45 ++++++++++++---------
 1 files changed, 26 insertions(+), 19 deletions(-)

-- 
OpenAFS Master Repository