summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2010-09-17 16:23:53 +1000
committerAndrew Tridgell <tridge@samba.org>2010-10-14 02:35:04 +0000
commit7c6105ec27612adc712d3afcd3a794b6b7d32d8d (patch)
treebcbb0daf59a3af16cfa450a081693a5477a024a1 /source3
parent170b345e0c688b178eb37a73a8110dec68a8ae31 (diff)
downloadsamba-7c6105ec27612adc712d3afcd3a794b6b7d32d8d.tar.gz
samba-7c6105ec27612adc712d3afcd3a794b6b7d32d8d.tar.bz2
samba-7c6105ec27612adc712d3afcd3a794b6b7d32d8d.zip
s3-util_nttoken.c Also copy the rights_mask when copying a security_token
These are unused in source3/ code at the moment, but it would be unfortunate if that were to change, and this function not be updated. Andrew Bartlett Signed-off-by: Andrew Tridgell <tridge@samba.org>
Diffstat (limited to 'source3')
-rw-r--r--source3/lib/util_nttoken.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/source3/lib/util_nttoken.c b/source3/lib/util_nttoken.c
index 81def87931..2fd0f088ab 100644
--- a/source3/lib/util_nttoken.c
+++ b/source3/lib/util_nttoken.c
@@ -58,6 +58,7 @@ struct security_token *dup_nt_token(TALLOC_CTX *mem_ctx, const struct security_t
}
token->privilege_mask = ptoken->privilege_mask;
+ token->rights_mask = ptoken->rights_mask;
return token;
}
@@ -107,6 +108,9 @@ NTSTATUS merge_nt_token(TALLOC_CTX *mem_ctx,
token->privilege_mask |= token_1->privilege_mask;
token->privilege_mask |= token_2->privilege_mask;
+ token->rights_mask |= token_1->rights_mask;
+ token->rights_mask |= token_2->rights_mask;
+
*token_out = token;
return NT_STATUS_OK;