diff options
| author | Volker Lendecke <vl@samba.org> | 2008-04-28 10:31:49 +0200 |
|---|---|---|
| committer | Volker Lendecke <vl@samba.org> | 2008-05-05 11:23:13 +0200 |
| commit | d62563342e8c83d67dbcfb0c4b8e2ed886742006 (patch) | |
| tree | 3eb93d7b3afde17ea6f11021eb1e1cc3e5c7a6f7 /source3/smbd/service.c | |
| parent | 2c00ff5407d5b126c8d38ceb2bcc8626ee7c0c5d (diff) | |
| download | samba-d62563342e8c83d67dbcfb0c4b8e2ed886742006.tar.gz samba-d62563342e8c83d67dbcfb0c4b8e2ed886742006.tar.bz2 samba-d62563342e8c83d67dbcfb0c4b8e2ed886742006.zip | |
Remove connection_struct->mem_ctx, connection_struct is its own parent
(This used to be commit 559180f7d30606d1999399d954ceedc798c669a4)
Diffstat (limited to 'source3/smbd/service.c')
| -rw-r--r-- | source3/smbd/service.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/source3/smbd/service.c b/source3/smbd/service.c index 33b2cb26c1..a405ffc9bc 100644 --- a/source3/smbd/service.c +++ b/source3/smbd/service.c @@ -529,12 +529,12 @@ static NTSTATUS find_forced_user(connection_struct *conn, bool vuser_is_guest, f char *fuser, *found_username; NTSTATUS result; - if (!(fuser = talloc_string_sub(conn->mem_ctx, lp_force_user(snum), "%S", + if (!(fuser = talloc_string_sub(conn, lp_force_user(snum), "%S", lp_servicename(snum)))) { return NT_STATUS_NO_MEMORY; } - result = create_token_from_username(conn->mem_ctx, fuser, vuser_is_guest, + result = create_token_from_username(conn, fuser, vuser_is_guest, &conn->uid, &conn->gid, &found_username, &conn->nt_user_token); if (!NT_STATUS_IS_OK(result)) { @@ -697,7 +697,7 @@ static connection_struct *make_connection_snum(int snum, user_struct *vuser, *status = NT_STATUS_NO_SUCH_USER; return NULL; } - status2 = create_token_from_username(conn->mem_ctx, pass->pw_name, True, + status2 = create_token_from_username(conn, pass->pw_name, True, &conn->uid, &conn->gid, &found_username, &conn->nt_user_token); @@ -757,7 +757,7 @@ static connection_struct *make_connection_snum(int snum, user_struct *vuser, return NULL; } pass = Get_Pwnam_alloc(talloc_tos(), user); - status2 = create_token_from_username(conn->mem_ctx, pass->pw_name, True, + status2 = create_token_from_username(conn, pass->pw_name, True, &conn->uid, &conn->gid, &found_username, &conn->nt_user_token); @@ -903,7 +903,7 @@ static connection_struct *make_connection_snum(int snum, user_struct *vuser, sid_string_dbg(sid))); continue; } - if (!add_gid_to_array_unique(conn->mem_ctx, gid, &conn->groups, + if (!add_gid_to_array_unique(conn, gid, &conn->groups, &conn->ngroups)) { DEBUG(0, ("add_gid_to_array_unique failed\n")); conn_free(conn); @@ -1017,7 +1017,7 @@ static connection_struct *make_connection_snum(int snum, user_struct *vuser, } if ((!conn->printer) && (!conn->ipc)) { - conn->notify_ctx = notify_init(conn->mem_ctx, server_id_self(), + conn->notify_ctx = notify_init(conn, server_id_self(), smbd_messaging_context(), smbd_event_context(), conn); |