diff options
author | Günther Deschner <gd@samba.org> | 2021-02-25 23:19:25 +0100 |
---|---|---|
committer | Günther Deschner <gd@samba.org> | 2021-07-14 16:49:29 +0000 |
commit | 705f9954582cf314a8b0542d166868bf406d1843 (patch) | |
tree | 561c8df708c5a86623e33bd4b3c432c0b8de856f /librpc | |
parent | 9963da126becaf994fb86df911fb45085316fb99 (diff) | |
download | samba-705f9954582cf314a8b0542d166868bf406d1843.tar.gz |
librpc: make sure the 4 byte _pad in ODJ_WIN7BLOB is never 0
Guenther
Signed-off-by: Guenther Deschner <gd@samba.org>
Reviewed-by: Alexander Bokovoy <ab@samba.org>
Diffstat (limited to 'librpc')
-rw-r--r-- | librpc/idl/ODJ.idl | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/librpc/idl/ODJ.idl b/librpc/idl/ODJ.idl index a60ed94a5e5..00c731b76a9 100644 --- a/librpc/idl/ODJ.idl +++ b/librpc/idl/ODJ.idl @@ -99,7 +99,16 @@ interface ODJ [string,charset(UTF16)] uint16 *lpDomain; [string,charset(UTF16)] uint16 *lpMachineName; [string,charset(UTF16)] [flag(NDR_SECRET)] uint16 *lpMachinePassword; + /* + * Not sure whether the following 4 bytes are padding or a + * pointer, at least it's value may not be 0 for Windows to accept our + * generated win7blobs - gd + */ +#if 0 [flag(NDR_ALIGN8)] DATA_BLOB _pad; +#else + [value(0xffffffff)] uint32 _pad; +#endif ODJ_POLICY_DNS_DOMAIN_INFO DnsDomainInfo; netr_DsRGetDCNameInfo DcInfo; DWORD Options; |