Pull up r17534 from trunk. Commit By: tlyu Revision: 17541 Changed Files: U branches/krb5-1-4/src/windows/kfwlogon/kfwcommon.c U branches/krb5-1-4/src/windows/kfwlogon/kfwlogon.c