diff options
| author | Simo Sorce <idra@samba.org> | 2010-07-16 09:57:03 -0400 |
|---|---|---|
| committer | Simo Sorce <idra@samba.org> | 2010-07-16 09:57:03 -0400 |
| commit | 378e4d5b8d30733f0f28cc2bceb28d9b9b594707 (patch) | |
| tree | 9f6faebdcf58c73e0297bfdf3b905ef256f8e478 /source4/smbd/process_single.c | |
| parent | 2f249538ac8f2a54d9c8f8dbf0107db2f33bfe16 (diff) | |
| parent | 6b266b85cf34145ac1f03d8f787b81121e4ec92b (diff) | |
| download | samba-378e4d5b8d30733f0f28cc2bceb28d9b9b594707.tar.gz samba-378e4d5b8d30733f0f28cc2bceb28d9b9b594707.tar.bz2 samba-378e4d5b8d30733f0f28cc2bceb28d9b9b594707.zip | |
Merge branch 'master' of ssh://git.samba.org/data/git/samba
Diffstat (limited to 'source4/smbd/process_single.c')
| -rw-r--r-- | source4/smbd/process_single.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source4/smbd/process_single.c b/source4/smbd/process_single.c index ec5f529aa1..688b46e0a0 100644 --- a/source4/smbd/process_single.c +++ b/source4/smbd/process_single.c @@ -71,7 +71,7 @@ static void single_accept_connection(struct tevent_context *ev, /* The cluster_id(0, fd) cannot collide with the incrementing * task below, as the first component is 0, not 1 */ - new_conn(ev, lp_ctx, connected_socket, + new_conn(ev, lp_ctx, connected_socket, cluster_id(0, socket_get_fd(connected_socket)), private_data); } @@ -79,7 +79,7 @@ static void single_accept_connection(struct tevent_context *ev, called to startup a new task */ static void single_new_task(struct tevent_context *ev, - struct loadparm_context *lp_ctx, + struct loadparm_context *lp_ctx, const char *service_name, void (*new_task)(struct tevent_context *, struct loadparm_context *, struct server_id, void *), void *private_data) @@ -97,7 +97,7 @@ static void single_new_task(struct tevent_context *ev, /* called when a task goes down */ -static void single_terminate(struct tevent_context *ev, struct loadparm_context *lp_ctx, const char *reason) +static void single_terminate(struct tevent_context *ev, struct loadparm_context *lp_ctx, const char *reason) { DEBUG(3,("single_terminate: reason[%s]\n",reason)); } |