libcli/security: clean up and fix make_sec_desc