r8805: Merge a duplicate struct. Get ready to support SPNEGO rpc binds.