r6094: Work on the Kerberos code recently merged from Samba 3.0. This fixes