diff options
| author | Volker Lendecke <vl@samba.org> | 2019-03-11 17:11:06 +0100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2019-03-12 00:42:19 +0000 |
| commit | d7de2f77485bf623f8ca0edc5c0fb823ed9bc1e2 (patch) | |
| tree | ff15bfe7169989dc068f1750752983aa902be25c /libcli | |
| parent | e18610a197aab80a32cae8c1e09b96496679bbad (diff) | |
| download | samba-d7de2f77485bf623f8ca0edc5c0fb823ed9bc1e2.tar.gz | |
lib: Remove "struct sid_parse_ret" again
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Diffstat (limited to 'libcli')
| -rw-r--r-- | libcli/security/dom_sid.h | 4 | ||||
| -rw-r--r-- | libcli/security/util_sid.c | 7 |
2 files changed, 4 insertions, 7 deletions
diff --git a/libcli/security/dom_sid.h b/libcli/security/dom_sid.h index bc66280291b..57108ce2a9c 100644 --- a/libcli/security/dom_sid.h +++ b/libcli/security/dom_sid.h @@ -112,9 +112,7 @@ bool sid_split_rid(struct dom_sid *sid, uint32_t *rid); bool sid_peek_rid(const struct dom_sid *sid, uint32_t *rid); bool sid_peek_check_rid(const struct dom_sid *exp_dom_sid, const struct dom_sid *sid, uint32_t *rid); void sid_copy(struct dom_sid *dst, const struct dom_sid *src); -struct sid_parse_ret { ssize_t len; }; -struct sid_parse_ret sid_parse( - const uint8_t *inbuf, size_t len, struct dom_sid *sid); +ssize_t sid_parse(const uint8_t *inbuf, size_t len, struct dom_sid *sid); int sid_compare_domain(const struct dom_sid *sid1, const struct dom_sid *sid2); NTSTATUS add_sid_to_array(TALLOC_CTX *mem_ctx, const struct dom_sid *sid, struct dom_sid **sids, uint32_t *num); diff --git a/libcli/security/util_sid.c b/libcli/security/util_sid.c index 4a186d69cda..e47ed04c30f 100644 --- a/libcli/security/util_sid.c +++ b/libcli/security/util_sid.c @@ -300,8 +300,7 @@ void sid_copy(struct dom_sid *dst, const struct dom_sid *src) Parse a on-the-wire SID to a struct dom_sid. *****************************************************************/ -struct sid_parse_ret sid_parse( - const uint8_t *inbuf, size_t len, struct dom_sid *sid) +ssize_t sid_parse(const uint8_t *inbuf, size_t len, struct dom_sid *sid) { DATA_BLOB in = data_blob_const(inbuf, len); enum ndr_err_code ndr_err; @@ -309,9 +308,9 @@ struct sid_parse_ret sid_parse( ndr_err = ndr_pull_struct_blob_all( &in, NULL, sid, (ndr_pull_flags_fn_t)ndr_pull_dom_sid); if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) { - return (struct sid_parse_ret) { .len = -1 }; + return -1; } - return (struct sid_parse_ret) { .len = ndr_size_dom_sid(sid, 0) }; + return ndr_size_dom_sid(sid, 0); } /***************************************************************** |