This should also be pulled up to 1.9. The patch to krb5_32.def won't apply to either branch, but applying the functional part by hand should be easy.