sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-24 21:34:56 +03:00
Code

s3:smbd/globals: change 'int am_parent' into 'struct smbd_parent_context *am_parent'

Browse Source 
This is a short term solution on the way to get rid of 'am_parent' completely.

metze
This commit is contained in:
Stefan Metzmacher 2011-12-13 14:58:50 +01:00
parent 010d6003e3
commit 6d15ca3482
3 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source3/smbd/globals.c
View File

@ -98,7 +98,7 @@ int32_t exclusive_oplocks_open = 0;
int32_t level_II_oplocks_open = 0;
struct kernel_oplocks *koplocks = NULL;
int am_parent = 1;
struct smbd_parent_context *am_parent = NULL;
struct memcache *smbd_memcache_ctx = NULL;
bool exit_firsttime = true;
struct child_pid *children = 0;

3
source3/smbd/globals.h
View File

@ -113,7 +113,8 @@ extern int32_t exclusive_oplocks_open;
extern int32_t level_II_oplocks_open;
extern struct kernel_oplocks *koplocks;
extern int am_parent;
struct smbd_parent_context;
extern struct smbd_parent_context *am_parent;
extern struct memcache *smbd_memcache_ctx;
extern bool exit_firsttime;
struct child_pid;

17
source3/smbd/server.c
View File

@ -416,7 +416,14 @@ static void smbd_accept_connection(struct tevent_context *ev,
NTSTATUS status = NT_STATUS_OK;
/* Child code ... */
am_parent = 0;
am_parent = NULL;
/*
* Can't use TALLOC_FREE here. Nulling out the argument to it
* would overwrite memory we've just freed.
*/
talloc_free(s->parent);
s = NULL;
set_my_unique_id(unique_id);
@ -430,13 +437,6 @@ static void smbd_accept_connection(struct tevent_context *ev,
close_low_fds(False); /* Don't close stderr */
}
/*
* Can't use TALLOC_FREE here. Nulling out the argument to it
* would overwrite memory we've just freed.
*/
talloc_free(s->parent);
s = NULL;
status = reinit_after_fork(msg_ctx,
ev,
true);
@ -1146,6 +1146,7 @@ extern void build_options(bool screen);
parent->interactive = interactive;
parent->ev_ctx = ev_ctx;
parent->msg_ctx = msg_ctx;
am_parent = parent;
se = tevent_add_signal(parent->ev_ctx,
parent,