diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2008-04-14 19:32:42 +0200 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2008-04-14 19:32:42 +0200 |
| commit | 68a2c547d00d7a8d0c15744172489d9d010c31a3 (patch) | |
| tree | 54313b0dc50014015d680121fa750a5d4777c7a4 /source4/libnet/libnet.c | |
| parent | 2cdfaedee203a726bddfb46fb10d9604de32a05f (diff) | |
| parent | 4f51b0246db3242ee02ee16905cba13a5dc5633a (diff) | |
| download | samba-68a2c547d00d7a8d0c15744172489d9d010c31a3.tar.gz samba-68a2c547d00d7a8d0c15744172489d9d010c31a3.tar.xz samba-68a2c547d00d7a8d0c15744172489d9d010c31a3.zip | |
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet
(This used to be commit 0f0c8519b87481e3473a469cefd51c76b4a7632e)
Diffstat (limited to 'source4/libnet/libnet.c')
| -rw-r--r-- | source4/libnet/libnet.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/source4/libnet/libnet.c b/source4/libnet/libnet.c index d1605bc17d..c966898cee 100644 --- a/source4/libnet/libnet.c +++ b/source4/libnet/libnet.c @@ -28,20 +28,17 @@ struct libnet_context *libnet_context_init(struct event_context *ev, { struct libnet_context *ctx; + /* We require an event context here */ + if (!ev) { + return NULL; + } + /* create brand new libnet context */ ctx = talloc(ev, struct libnet_context); if (!ctx) { return NULL; } - /* events */ - if (ev == NULL) { - ev = event_context_find(ctx); - if (ev == NULL) { - talloc_free(ctx); - return NULL; - } - } ctx->event_ctx = ev; ctx->lp_ctx = lp_ctx; |