r6806: Try again to fix the build on various kerberos libs.