diff options
| author | Joseph Sutton <josephsutton@catalyst.net.nz> | 2023-02-27 12:19:08 +1300 |
|---|---|---|
| committer | Jule Anger <janger@samba.org> | 2023-03-20 10:03:38 +0100 |
| commit | e46739cb89763812c29b8e5180e55cb60cbfbca7 (patch) | |
| tree | 36cc573cb18a77f7e45a375bb4266caa64ae5c36 | |
| parent | 95be170f9978ed255f1b8cbcdf28de4475cdc96c (diff) | |
| download | samba-e46739cb89763812c29b8e5180e55cb60cbfbca7.tar.gz | |
CVE-2023-0614 s4-dsdb: Add samdb_result_dom_sid_buf()
This function parses a SID from an ldb_message, similar to
samdb_result_dom_sid(), but does it without allocating anything.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=15270
Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
[abartlet@samba.org Adapted for simple conflicts due to
56297449f9c2e94505a72a70a3a3c5990d00d37f trimming
trailing whitespace]
| -rw-r--r-- | source4/dsdb/common/util.c | 22 |
1 files changed, 21 insertions, 1 deletions
diff --git a/source4/dsdb/common/util.c b/source4/dsdb/common/util.c index 02472f8a89c..1436cd7bfec 100644 --- a/source4/dsdb/common/util.c +++ b/source4/dsdb/common/util.c @@ -366,7 +366,27 @@ struct dom_sid *samdb_result_dom_sid(TALLOC_CTX *mem_ctx, const struct ldb_messa } /* - pull a guid structure from a objectGUID in a result set. + pull a dom_sid structure from a objectSid in a result set. +*/ +int samdb_result_dom_sid_buf(const struct ldb_message *msg, + const char *attr, + struct dom_sid *sid) +{ + ssize_t ret; + const struct ldb_val *v = NULL; + v = ldb_msg_find_ldb_val(msg, attr); + if (v == NULL) { + return LDB_ERR_NO_SUCH_ATTRIBUTE; + } + ret = sid_parse(v->data, v->length, sid); + if (ret == -1) { + return LDB_ERR_OPERATIONS_ERROR; + } + return LDB_SUCCESS; +} + +/* + pull a guid structure from a objectGUID in a result set. */ struct GUID samdb_result_guid(const struct ldb_message *msg, const char *attr) { |