summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--source4/include/context.h4
-rw-r--r--source4/smb_server/smb_server.c10
2 files changed, 7 insertions, 7 deletions
diff --git a/source4/include/context.h b/source4/include/context.h
index 68ae3ffc88..5070228440 100644
--- a/source4/include/context.h
+++ b/source4/include/context.h
@@ -29,7 +29,7 @@
*/
/* the current user context for a request */
-struct user_context {
+struct smbsrv_user {
/* the vuid is used to specify the security context for this
request. Note that this may not be the same vuid as we
received on the wire (for example, for share mode or guest
@@ -87,7 +87,7 @@ struct request_context {
struct tcon_context *conn;
/* the user context is derived from the vuid plus smb.conf options */
- struct user_context *user_ctx;
+ struct smbsrv_user *user_ctx;
/* a talloc context for the lifetime of this request */
TALLOC_CTX *mem_ctx;
diff --git a/source4/smb_server/smb_server.c b/source4/smb_server/smb_server.c
index a89007d68d..823757ff3b 100644
--- a/source4/smb_server/smb_server.c
+++ b/source4/smb_server/smb_server.c
@@ -118,13 +118,13 @@ static struct request_context *receive_smb_request(struct smbsrv_context *smb_ct
*/
static void setup_user_context(struct request_context *req)
{
- struct user_context *ctx;
+ struct smbsrv_user *user_ctx;
- ctx = talloc(req->mem_ctx, sizeof(*ctx));
- ctx->vuid = SVAL(req->in.hdr, HDR_UID);
- ctx->vuser = get_valid_user_struct(req->smb_ctx, ctx->vuid);
+ user_ctx = talloc(req->mem_ctx, sizeof(*user_ctx));
+ user_ctx->vuid = SVAL(req->in.hdr, HDR_UID);
+ user_ctx->vuser = get_valid_user_struct(req->smb_ctx, user_ctx->vuid);
- req->user_ctx = ctx;
+ req->user_ctx = user_ctx;
}