More work to adapt to merged libcli/auth function prototypes