OpenAFS Master Repository branch, openafs-devel-1_7_x, updated. openafs-devel-1_7_4-27-g688044b

[Gerrit Code Review]

The following commit has been merged in the openafs-devel-1_7_x branch:
commit 9f2780de0c1eb7a9f2f1e6f192e3043679a3ea2b
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.
    
    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>
    (cherry picked from commit 9b42af9326dbf34a7a657a7d4a2ea6d845c845e1)
    
    Change-Id: Id6548405ba099f7ffdaad5859e0c9ca748efaaa1
    Reviewed-on: http://gerrit.openafs.org/6475
    Tested-by: BuildBot <buildbot@rampaginggeek.com>
    Reviewed-by: Jeffrey Altman <jaltman@secure-endpoints.com>
    Tested-by: Jeffrey Altman <jaltman@secure-endpoints.com>

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

-- 
OpenAFS Master Repository