diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-04-22 10:21:22 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-04-22 10:21:22 +0200 |
| commit | 38a4f9df170fba0a05755e06dd4362d471b3db80 (patch) | |
| tree | a1f3623e06ce4fd1e010afd5e72062dbee0d9b83 /source4/lib/messaging/messaging.c | |
| parent | 54efc107e58ed1eed7109ea08fdf808e3a15327b (diff) | |
| parent | 7dddab3f6cdb36a537ca3ed9c9f3461993d1c11c (diff) | |
| download | samba-38a4f9df170fba0a05755e06dd4362d471b3db80.tar.gz samba-38a4f9df170fba0a05755e06dd4362d471b3db80.tar.xz samba-38a4f9df170fba0a05755e06dd4362d471b3db80.zip | |
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test
(This used to be commit 1e38de45640430be002053b8bd52b615184134ba)
Diffstat (limited to 'source4/lib/messaging/messaging.c')
| -rw-r--r-- | source4/lib/messaging/messaging.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source4/lib/messaging/messaging.c b/source4/lib/messaging/messaging.c index 29d6e00247..19284461ee 100644 --- a/source4/lib/messaging/messaging.c +++ b/source4/lib/messaging/messaging.c @@ -544,6 +544,10 @@ struct messaging_context *messaging_init(TALLOC_CTX *mem_ctx, NTSTATUS status; struct socket_address *path; + if (ev == NULL) { + return NULL; + } + msg = talloc_zero(mem_ctx, struct messaging_context); if (msg == NULL) { return NULL; @@ -556,10 +560,6 @@ struct messaging_context *messaging_init(TALLOC_CTX *mem_ctx, return NULL; } - if (ev == NULL) { - ev = event_context_init(msg); - } - /* create the messaging directory if needed */ mkdir(dir, 0700); |