Attachment 16819 Details for Bug 14835 – Samba IDL for new HAS_SAM_NAME_AND_SID behaviour

[patch] Samba IDL for new HAS_SAM_NAME_AND_SID behaviour

0001-krb5pac-Add-new-buffers-for-samAccountName-and-objec.patch (text/plain), 2.07 KB, created by Andrew Bartlett on 2021-09-26 22:24:57 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andrew Bartlett

Created: 2021-09-26 22:24:57 UTC

Size: 2.07 KB

patch

obsolete

>From 161341916b15c4f26a7cabf7f4db60d0b559b96e Mon Sep 17 00:00:00 2001
>From: Andrew Bartlett <abartlet@samba.org>
>Date: Mon, 27 Sep 2021 11:20:19 +1300
>Subject: [PATCH] krb5pac: Add new buffers for samAccountName and objectSID
>
>These appear when PAC_UPN_DNS_FLAG_HAS_SAM_NAME_AND_SID is set.
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=14835
>Signed-off-by: Andrew Bartlett <abartlet@samba.org>
>---
> librpc/idl/krb5pac.idl | 16 +++++++++++++++-
> 1 file changed, 15 insertions(+), 1 deletion(-)
>
>diff --git a/librpc/idl/krb5pac.idl b/librpc/idl/krb5pac.idl
>index 3239d7656b6..30c8f0fa912 100644
>--- a/librpc/idl/krb5pac.idl
>+++ b/librpc/idl/krb5pac.idl
>@@ -86,15 +86,29 @@ interface krb5pac
> 	} PAC_CONSTRAINED_DELEGATION;
> 
> 	typedef [bitmap32bit] bitmap {
>-		PAC_UPN_DNS_FLAG_CONSTRUCTED = 0x00000001
>+		PAC_UPN_DNS_FLAG_CONSTRUCTED = 0x00000001,
>+		PAC_UPN_DNS_FLAG_HAS_SAM_NAME_AND_SID = 0x00000002
> 	} PAC_UPN_DNS_FLAGS;
> 
>+	typedef struct {
>+		[value(2*strlen_m(samaccountname))] uint16 samaccountname_size;
>+		[relative_short,subcontext(0),subcontext_size(samaccountname_size),flag(NDR_ALIGN8|STR_NOTERM|NDR_REMAINING)] string *samaccountname;
>+		[value(ndr_size_dom_sid(objectsid, ndr->flags))] uint16 objectsid_size;
>+		[relative_short,subcontext(0),subcontext_size(objectsid_size)] dom_sid *objectsid;
>+	} PAC_UPN_DNS_INFO_SAM_NAME_AND_SID;
>+
>+	typedef [nodiscriminant] union {
>+		[case(PAC_UPN_DNS_FLAG_HAS_SAM_NAME_AND_SID)] PAC_UPN_DNS_INFO_SAMACCOUNT_AND_SID sam_name_and_sid;
>+		[default];
>+	} PAC_UPN_DNS_INFO_EX;
>+
> 	typedef struct {
> 		[value(2*strlen_m(upn_name))] uint16 upn_name_size;
> 		[relative_short,subcontext(0),subcontext_size(upn_name_size),flag(NDR_ALIGN8|STR_NOTERM|NDR_REMAINING)] string *upn_name;
> 		[value(2*strlen_m(dns_domain_name))] uint16 dns_domain_name_size;
> 		[relative_short,subcontext(0),subcontext_size(dns_domain_name_size),flag(NDR_ALIGN8|STR_NOTERM|NDR_REMAINING)] string *dns_domain_name;
> 		PAC_UPN_DNS_FLAGS flags;
>+		[switch_is(flags & PAC_UPN_DNS_FLAG_HAS_SAM_NAME_AND_SID)] PAC_UPN_DNS_INFO_EX ex;
> 	} PAC_UPN_DNS_INFO;
> 
> 	typedef [public] struct {
>-- 
>2.25.1
>

Actions: View

Attachments on bug 14835: 16807 | 16819 | 16826 | 17062