diff options
| author | Stefan Metzmacher <metze@samba.org> | 2015-01-05 15:59:31 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2015-01-06 20:25:04 +0100 |
| commit | cfe6377173ef093cb90b167000b86e6626568b61 (patch) | |
| tree | e1159f8770931455c3e43ca3bc06879032e617b1 /source4/rpc_server | |
| parent | a2670f15dea27c10e3827216adf572f9c3894f85 (diff) | |
| download | samba-cfe6377173ef093cb90b167000b86e6626568b61.tar.gz samba-cfe6377173ef093cb90b167000b86e6626568b61.tar.xz samba-cfe6377173ef093cb90b167000b86e6626568b61.zip | |
s4:rpc_server/lsa: allow LSA_TRUST_ATTRIBUTE_FOREST_TRANSITIVE to be changed.
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Simo Sorce <idra@samba.org>
Diffstat (limited to 'source4/rpc_server')
| -rw-r--r-- | source4/rpc_server/lsa/dcesrv_lsa.c | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/source4/rpc_server/lsa/dcesrv_lsa.c b/source4/rpc_server/lsa/dcesrv_lsa.c index 020360df72..f3d30477e9 100644 --- a/source4/rpc_server/lsa/dcesrv_lsa.c +++ b/source4/rpc_server/lsa/dcesrv_lsa.c @@ -1766,6 +1766,7 @@ static NTSTATUS setInfoTrustedDomain_base(struct dcesrv_call_state *dce_call, if (info_ex) { uint32_t origattrs; + uint32_t changed_attrs; uint32_t origdir; int origtype; @@ -1815,11 +1816,20 @@ static NTSTATUS setInfoTrustedDomain_base(struct dcesrv_call_state *dce_call, } /* TODO: check forestFunctionality from ldb opaque */ /* TODO: check what is set makes sense */ - /* for now refuse changes */ - if (origattrs == -1 || - origattrs != info_ex->trust_attributes) { - DEBUG(1, ("Attempted to change trust attributes! " - "Operation not handled\n")); + + changed_attrs = origattrs ^ info_ex->trust_attributes; + if (changed_attrs & ~LSA_TRUST_ATTRIBUTE_FOREST_TRANSITIVE) { + /* + * For now we only allow + * LSA_TRUST_ATTRIBUTE_FOREST_TRANSITIVE to be changed. + * + * TODO: we may need to support more attribute changes + */ + DEBUG(1, ("Attempted to change trust attributes " + "(0x%08x != 0x%08x)! " + "Operation not handled yet...\n", + (unsigned)origattrs, + (unsigned)info_ex->trust_attributes)); return NT_STATUS_INVALID_PARAMETER; } } |