git.samba.org
/
mat
/
samba.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
dc38db3
)
s3:smbd/server: create smbd_parent_context earlier
author
Stefan Metzmacher
<metze@samba.org>
Tue, 13 Dec 2011 07:54:49 +0000
(08:54 +0100)
committer
Stefan Metzmacher
<metze@samba.org>
Tue, 13 Dec 2011 11:36:35 +0000
(12:36 +0100)
metze
source3/smbd/server.c
patch
|
blob
|
history
diff --git
a/source3/smbd/server.c
b/source3/smbd/server.c
index 7bb846a03d0b5d2336d5bd09ce27f3942b9a3e33..7985efc8958c3631cf9afc3ee81079c12865c204 100644
(file)
--- a/
source3/smbd/server.c
+++ b/
source3/smbd/server.c
@@
-1126,6
+1126,14
@@
extern void build_options(bool screen);
smbd_server_conn->msg_ctx = msg_ctx;
smbd_server_conn->msg_ctx = msg_ctx;
+ parent = talloc_zero(ev_ctx, struct smbd_parent_context);
+ if (!parent) {
+ exit_server("talloc(struct smbd_parent_context) failed");
+ }
+ parent->interactive = interactive;
+ parent->ev_ctx = ev_ctx;
+ parent->msg_ctx = msg_ctx;
+
smbd_setup_sig_term_handler();
smbd_setup_sig_hup_handler(ev_ctx,
msg_ctx);
smbd_setup_sig_term_handler();
smbd_setup_sig_hup_handler(ev_ctx,
msg_ctx);
@@
-1284,13
+1292,6
@@
extern void build_options(bool screen);
return(0);
}
return(0);
}
- parent = talloc_zero(ev_ctx, struct smbd_parent_context);
- if (!parent) {
- exit_server("talloc(struct smbd_parent_context) failed");
- }
- parent->interactive = interactive;
- parent->ev_ctx = ev_ctx;
- parent->msg_ctx = msg_ctx;
if (!open_sockets_smbd(parent, ev_ctx, msg_ctx, ports))
exit_server("open_sockets_smbd() failed");
if (!open_sockets_smbd(parent, ev_ctx, msg_ctx, ports))
exit_server("open_sockets_smbd() failed");