r16945: Sync trunk -> 3.0 for 3.0.24 code. Still need

[vlendec/samba-autobuild/.git] / source3 / smbd / share_access.c

diff --git a/source3/smbd/share_access.c b/source3/smbd/share_access.c
index 468f61560b927c10fdea0181816b7c2de572ade7..5334976d8dc7d903e43fb23241bd57f495db1d74 100644 (file)
--- a/source3/smbd/share_access.c
+++ b/source3/smbd/share_access.c
@@ -28,6 +28,8 @@
  * + and & may be combined
  */
 
+extern userdom_struct current_user_info;
+
 static BOOL do_group_checks(const char **name, const char **pattern)
 {
        if ((*name)[0] == '@') {
@@ -74,7 +76,8 @@ static BOOL token_contains_name(TALLOC_CTX *mem_ctx,
        enum SID_NAME_USE type;
 
        if (username != NULL) {
-               name = talloc_sub_basic(mem_ctx, username, name);
+               name = talloc_sub_basic(mem_ctx, username,
+                                       current_user_info.domain, name);
        }
        if (sharename != NULL) {
                name = talloc_string_sub(mem_ctx, name, "%S", sharename);