diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2005-01-12 11:16:04 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:08:46 -0500 |
| commit | 7ea2317e972f5bea29b43a7b6ad37ac7591f86e8 (patch) | |
| tree | 5a292573998c8f4fdd6d7c4fff4d68c55a8789f1 /source4 | |
| parent | 9178e7b8bf18ca2782b4e19a3f4ce49e54366712 (diff) | |
| download | samba-7ea2317e972f5bea29b43a7b6ad37ac7591f86e8.tar.gz samba-7ea2317e972f5bea29b43a7b6ad37ac7591f86e8.tar.bz2 samba-7ea2317e972f5bea29b43a7b6ad37ac7591f86e8.zip | |
r4708: Comparing with LDAP, it is clear that these 'flags' are in fact the
POSIX offset for the trusted domain.
Andrew Bartlett
(This used to be commit cd9e795e4004e28dc0184b86f0c44431378fc3ff)
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/librpc/idl/lsa.idl | 26 | ||||
| -rw-r--r-- | source4/librpc/idl/netlogon.idl | 2 | ||||
| -rw-r--r-- | source4/torture/rpc/samsync.c | 2 |
3 files changed, 15 insertions, 15 deletions
diff --git a/source4/librpc/idl/lsa.idl b/source4/librpc/idl/lsa.idl index 9ed8756016..aa57db8d79 100644 --- a/source4/librpc/idl/lsa.idl +++ b/source4/librpc/idl/lsa.idl @@ -445,7 +445,7 @@ typedef enum { LSA_TRUSTED_DOMAIN_INFO_NAME=1, LSA_TRUSTED_DOMAIN_INFO_2=2, - LSA_TRUSTED_DOMAIN_INFO_FLAGS=3, + LSA_TRUSTED_DOMAIN_INFO_POSIX_OFFSET=3, LSA_TRUSTED_DOMAIN_INFO_PASSWORD=4, LSA_TRUSTED_DOMAIN_INFO_5=5, LSA_TRUSTED_DOMAIN_INFO_INFO_EX=6, @@ -459,8 +459,8 @@ } lsa_TrustDomainInfoName; typedef struct { - uint32 flags; - } lsa_TrustDomainInfoFlags; + uint32 posix_offset; + } lsa_TrustDomainInfoPosixOffset; typedef struct { lsa_DATA_BUF *password; @@ -498,7 +498,7 @@ typedef struct { lsa_TrustDomainInfoInfoEx info_ex; - lsa_TrustDomainInfoFlags flags; + lsa_TrustDomainInfoPosixOffset posix_offset; lsa_TrustDomainInfoAuthInfo auth_info; } lsa_TrustDomainInfoFullInfo; @@ -510,20 +510,20 @@ typedef struct { lsa_TrustDomainInfoInfoEx info_ex; lsa_DATA_BUF2 data1; - lsa_TrustDomainInfoFlags flags; + lsa_TrustDomainInfoPosixOffset posix_offset; lsa_TrustDomainInfoAuthInfo auth_info; } lsa_TrustDomainInfoInfoAll; typedef union { - [case(LSA_TRUSTED_DOMAIN_INFO_NAME)] lsa_TrustDomainInfoName name; - [case(LSA_TRUSTED_DOMAIN_INFO_FLAGS)] lsa_TrustDomainInfoFlags flags; - [case(LSA_TRUSTED_DOMAIN_INFO_PASSWORD)] lsa_TrustDomainInfoPassword password; - [case(LSA_TRUSTED_DOMAIN_INFO_5)] lsa_TrustDomainInfo5 info5; - [case(LSA_TRUSTED_DOMAIN_INFO_INFO_EX)] lsa_TrustDomainInfoInfoEx info_ex; - [case(LSA_TRUSTED_DOMAIN_INFO_AUTH_INFO)] lsa_TrustDomainInfoAuthInfo auth_info; - [case(LSA_TRUSTED_DOMAIN_INFO_FULL_INFO)] lsa_TrustDomainInfoFullInfo full_info; + [case(LSA_TRUSTED_DOMAIN_INFO_NAME)] lsa_TrustDomainInfoName name; + [case(LSA_TRUSTED_DOMAIN_INFO_POSIX_OFFSET)] lsa_TrustDomainInfoPosixOffset posix_offset; + [case(LSA_TRUSTED_DOMAIN_INFO_PASSWORD)] lsa_TrustDomainInfoPassword password; + [case(LSA_TRUSTED_DOMAIN_INFO_5)] lsa_TrustDomainInfo5 info5; + [case(LSA_TRUSTED_DOMAIN_INFO_INFO_EX)] lsa_TrustDomainInfoInfoEx info_ex; + [case(LSA_TRUSTED_DOMAIN_INFO_AUTH_INFO)] lsa_TrustDomainInfoAuthInfo auth_info; + [case(LSA_TRUSTED_DOMAIN_INFO_FULL_INFO)] lsa_TrustDomainInfoFullInfo full_info; [case(11)] lsa_TrustDomainInfo11 info11; - [case(LSA_TRUSTED_DOMAIN_INFO_INFO_ALL)] lsa_TrustDomainInfoInfoAll info_all; + [case(LSA_TRUSTED_DOMAIN_INFO_INFO_ALL)] lsa_TrustDomainInfoInfoAll info_all; } lsa_TrustedDomainInfo; /* Function: 0x1a */ diff --git a/source4/librpc/idl/netlogon.idl b/source4/librpc/idl/netlogon.idl index 8251969982..66c41fa8bc 100644 --- a/source4/librpc/idl/netlogon.idl +++ b/source4/librpc/idl/netlogon.idl @@ -517,7 +517,7 @@ interface netlogon netr_String unknown2; netr_String unknown3; netr_String unknown4; - uint32 flags; + uint32 posix_offset; uint32 unknown6; uint32 unknown7; uint32 unknown8; diff --git a/source4/torture/rpc/samsync.c b/source4/torture/rpc/samsync.c index 163c26d129..4da5d179e8 100644 --- a/source4/torture/rpc/samsync.c +++ b/source4/torture/rpc/samsync.c @@ -903,7 +903,7 @@ static BOOL samsync_handle_trusted_domain(TALLOC_CTX *mem_ctx, struct samsync_st TEST_STRING_EQUAL(info[8]->full_info.info_ex.netbios_name, trusted_domain->domain_name); } TEST_STRING_EQUAL(info[1]->name.netbios_name, trusted_domain->domain_name); - TEST_INT_EQUAL(info[3]->flags.flags, trusted_domain->flags); + TEST_INT_EQUAL(info[3]->posix_offset.posix_offset, trusted_domain->posix_offset); /* We would like to do this, but it is NOT_SUPPORTED on win2k3 TEST_SEC_DESC_EQUAL(trusted_domain->sdbuf, lsa, &trustdom_handle); |