r12051: Merge across the lookup_name and lookup_sid work. Lets see how the build...