Andrew, please review and push. Same fix that fixes the Microsoft torture tester I put into source3. Jeremy.