[SCM] Samba Shared Repository - branch v3-6-test updated
Günther Deschner
gd at samba.org
Thu Apr 7 06:55:34 MDT 2011
The branch, v3-6-test has been updated
via 636a101 s4-smbtorture: fix lsa forest trust test.
via d73beff lsa: use lsa_TrustedAccessMask in some more places in the lsa IDL.
from 7200440 s3-net: document "idmap check"
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test
- Log -----------------------------------------------------------------
commit 636a101fcca2d823d9e3e144dbbe3d5b73549342
Author: Günther Deschner <gd at samba.org>
Date: Thu Apr 7 12:05:58 2011 +0200
s4-smbtorture: fix lsa forest trust test.
lsa_lsaRSetForestTrustInformation takes a policy handle obtained from
lsaopenpolicy/lsaopenpolicy2 and not a trusted domain handle
(MS-LSAD 3.1.4.7.16 LsarSetForestTrustInformation (Opnum 74)).
Sumit, please check.
Guenther
Autobuild-User: Günther Deschner <gd at samba.org>
Autobuild-Date: Thu Apr 7 14:52:52 CEST 2011 on sn-devel-104
(cherry picked from commit ead6faab2766b786e124f2086093ef3fa05d115b)
commit d73beffedd872a277ebc24851b1235e2a90ef14f
Author: Günther Deschner <gd at samba.org>
Date: Thu Apr 7 11:47:44 2011 +0200
lsa: use lsa_TrustedAccessMask in some more places in the lsa IDL.
Guenther
(cherry picked from commit 26d67846d47d5d1be54d1a8b045f5293a4a02839)
-----------------------------------------------------------------------
Summary of changes:
librpc/idl/lsa.idl | 6 +++---
source4/torture/rpc/forest_trust.c | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
Changeset truncated at 500 lines:
diff --git a/librpc/idl/lsa.idl b/librpc/idl/lsa.idl
index abad501..fc59cd0 100644
--- a/librpc/idl/lsa.idl
+++ b/librpc/idl/lsa.idl
@@ -1053,7 +1053,7 @@ import "misc.idl", "security.idl";
[in] policy_handle *policy_handle,
[in] lsa_TrustDomainInfoInfoEx *info,
[in] lsa_TrustDomainInfoAuthInfoInternal *auth_info,
- [in] uint32 access_mask,
+ [in] lsa_TrustedAccessMask access_mask,
[out] policy_handle *trustdom_handle
);
@@ -1112,7 +1112,7 @@ import "misc.idl", "security.idl";
NTSTATUS lsa_OpenTrustedDomainByName(
[in] policy_handle *handle,
[in] lsa_String name,
- [in] uint32 access_mask,
+ [in] lsa_TrustedAccessMask access_mask,
[out] policy_handle *trustdom_handle
);
@@ -1187,7 +1187,7 @@ import "misc.idl", "security.idl";
[in] policy_handle *policy_handle,
[in] lsa_TrustDomainInfoInfoEx *info,
[in] lsa_TrustDomainInfoAuthInfoInternal *auth_info,
- [in] uint32 access_mask,
+ [in] lsa_TrustedAccessMask access_mask,
[out] policy_handle *trustdom_handle
);
diff --git a/source4/torture/rpc/forest_trust.c b/source4/torture/rpc/forest_trust.c
index 3ef3f1d..5b65930 100644
--- a/source4/torture/rpc/forest_trust.c
+++ b/source4/torture/rpc/forest_trust.c
@@ -189,7 +189,7 @@ static bool test_create_trust_and_set_info(struct dcerpc_pipe *p,
}
if (ret != false) {
- fti.in.handle = &trustdom_handle;
+ fti.in.handle = handle;
fti.in.trusted_domain_name = talloc_zero(tctx, struct lsa_StringLarge);
fti.in.trusted_domain_name->string = trust_name_dns;
fti.in.highest_record_type = 2;
--
Samba Shared Repository
More information about the samba-cvs
mailing list