Pull up Marcus's fixes to ntirpc

Signed-off-by: Adam C. Emerson <aemerson@linuxbox.com>