r24601: Fix if statements where we still expected cli_connect() to return BOOL.