sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-25 17:57:42 +03:00
Code

s4:auth: Have claims_data_encoded_claims_set() return a reference to the encoded claims

Browse Source 
Having the lifetime of the encoded claims be tied in a predictable
fashion to a caller‐controlled memory context is less prone to error.

Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
This commit is contained in:
Joseph Sutton 2023-10-05 15:11:42 +13:00 committed by Andrew Bartlett
parent e3953e18ae
commit 3e5aba62ec
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
source4/auth/session.c
View File

@ -612,9 +612,13 @@ NTSTATUS claims_data_from_claims_set(TALLOC_CTX *claims_data_ctx,
* From a ‘claims_data’ structure, return an encoded claims blob that can be put
* into a PAC.
*/
NTSTATUS claims_data_encoded_claims_set(struct claims_data *claims_data,
NTSTATUS claims_data_encoded_claims_set(TALLOC_CTX *mem_ctx,
struct claims_data *claims_data,
DATA_BLOB *encoded_claims_set_out)
{
uint8_t *data = NULL;
size_t len;
if (encoded_claims_set_out == NULL) {
return NT_STATUS_INVALID_PARAMETER;
}
@ -643,7 +647,15 @@ NTSTATUS claims_data_encoded_claims_set(struct claims_data *claims_data,
claims_data->flags |= CLAIMS_DATA_ENCODED_CLAIMS_PRESENT;
}
*encoded_claims_set_out = claims_data->encoded_claims_set;
if (claims_data->encoded_claims_set.data != NULL) {
data = talloc_reference(mem_ctx, claims_data->encoded_claims_set.data);
if (data == NULL) {
return NT_STATUS_NO_MEMORY;
}
}
len = claims_data->encoded_claims_set.length;
*encoded_claims_set_out = data_blob_const(data, len);
return NT_STATUS_OK;
}

3
source4/auth/session.h
View File

@ -136,7 +136,8 @@ NTSTATUS claims_data_from_claims_set(TALLOC_CTX *claims_data_ctx,
* From a ‘claims_data’ structure, return an encoded claims blob that can be put
* into a PAC.
*/
NTSTATUS claims_data_encoded_claims_set(struct claims_data *claims_data,
NTSTATUS claims_data_encoded_claims_set(TALLOC_CTX *mem_ctx,
struct claims_data *claims_data,
DATA_BLOB *encoded_claims_set_out);
/*