summaryrefslogtreecommitdiff
path: root/source3/modules
diff options
context:
space:
mode:
Diffstat (limited to 'source3/modules')
-rw-r--r--source3/modules/vfs_expand_msdfs.c2
-rw-r--r--source3/modules/vfs_full_audit.c3
-rw-r--r--source3/modules/vfs_recycle.c3
3 files changed, 5 insertions, 3 deletions
diff --git a/source3/modules/vfs_expand_msdfs.c b/source3/modules/vfs_expand_msdfs.c
index 9d4883c085..62222c48ff 100644
--- a/source3/modules/vfs_expand_msdfs.c
+++ b/source3/modules/vfs_expand_msdfs.c
@@ -147,7 +147,7 @@ static char *expand_msdfs_target(TALLOC_CTX *ctx,
lp_servicename(SNUM(conn)),
conn->user,
conn->connectpath,
- conn->gid,
+ conn->server_info->gid,
get_current_username(),
current_user_info.domain,
targethost);
diff --git a/source3/modules/vfs_full_audit.c b/source3/modules/vfs_full_audit.c
index 19a1d02de4..1b44e02375 100644
--- a/source3/modules/vfs_full_audit.c
+++ b/source3/modules/vfs_full_audit.c
@@ -694,7 +694,8 @@ static char *audit_prefix(TALLOC_CTX *ctx, connection_struct *conn)
}
return talloc_sub_advanced(ctx,
lp_servicename(SNUM(conn)), conn->user,
- conn->connectpath, conn->gid,
+ conn->connectpath,
+ conn->server_info->gid,
get_current_username(),
current_user_info.domain,
prefix);
diff --git a/source3/modules/vfs_recycle.c b/source3/modules/vfs_recycle.c
index da1716719a..27700367e6 100644
--- a/source3/modules/vfs_recycle.c
+++ b/source3/modules/vfs_recycle.c
@@ -433,7 +433,8 @@ static int recycle_unlink(vfs_handle_struct *handle, const char *file_name)
repository = talloc_sub_advanced(NULL, lp_servicename(SNUM(conn)),
conn->user,
- conn->connectpath, conn->gid,
+ conn->connectpath,
+ conn->server_info->gid,
get_current_username(),
current_user_info.domain,
recycle_repository(handle));