Author: abartlet Date: 2005-01-12 11:16:04 +0000 (Wed, 12 Jan 2005) New Revision: 4708
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=4708 Log: Comparing with LDAP, it is clear that these 'flags' are in fact the POSIX offset for the trusted domain. Andrew Bartlett Modified: branches/SAMBA_4_0/source/librpc/idl/lsa.idl branches/SAMBA_4_0/source/librpc/idl/netlogon.idl branches/SAMBA_4_0/source/torture/rpc/samsync.c Changeset: Modified: branches/SAMBA_4_0/source/librpc/idl/lsa.idl =================================================================== --- branches/SAMBA_4_0/source/librpc/idl/lsa.idl 2005-01-12 10:49:52 UTC (rev 4707) +++ branches/SAMBA_4_0/source/librpc/idl/lsa.idl 2005-01-12 11:16:04 UTC (rev 4708) @@ -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 */ Modified: branches/SAMBA_4_0/source/librpc/idl/netlogon.idl =================================================================== --- branches/SAMBA_4_0/source/librpc/idl/netlogon.idl 2005-01-12 10:49:52 UTC (rev 4707) +++ branches/SAMBA_4_0/source/librpc/idl/netlogon.idl 2005-01-12 11:16:04 UTC (rev 4708) @@ -517,7 +517,7 @@ netr_String unknown2; netr_String unknown3; netr_String unknown4; - uint32 flags; + uint32 posix_offset; uint32 unknown6; uint32 unknown7; uint32 unknown8; Modified: branches/SAMBA_4_0/source/torture/rpc/samsync.c =================================================================== --- branches/SAMBA_4_0/source/torture/rpc/samsync.c 2005-01-12 10:49:52 UTC (rev 4707) +++ branches/SAMBA_4_0/source/torture/rpc/samsync.c 2005-01-12 11:16:04 UTC (rev 4708) @@ -903,7 +903,7 @@ 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);
