OpenAFS Master Repository branch, master, updated. openafs-devel-1_5_76-2047-g9b42af9

[Gerrit Code Review]

The following commit has been merged in the master branch:
commit 9b42af9326dbf34a7a657a7d4a2ea6d845c845e1
Author: Jeffrey Altman <jaltman@your-file-system.com>
Date:   Thu Dec 29 22:18:59 2011 -0500

    Windows: protect merge status against dscp == scp
    
    If the directory status object is the same as the object for which
    status info is being merged, the object will refer to itself as its
    own parent.  Do not permit that.
    
    Change-Id: I6f7b6416f4c875a30dd5b85ba679389484523b12
    Reviewed-on: http://gerrit.openafs.org/6451
    Tested-by: BuildBot <buildbot@rampaginggeek.com>
    Tested-by: Jeffrey Altman <jaltman@secure-endpoints.com>
    Reviewed-by: Jeffrey Altman <jaltman@secure-endpoints.com>

 src/WINNT/afsd/cm_scache.c |   29 ++++++++++++++++++++---------
 1 files changed, 20 insertions(+), 9 deletions(-)

-- 
OpenAFS Master Repository