marcus, a more complete patch is in 6323

http://krbdev.mit.edu/rt/Ticket/Display.html?id=6323