diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-04-14 20:00:32 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-04-14 20:00:32 +0200 |
| commit | 18f8f5d6561d50b9179541ea24e03a5a807a2a2a (patch) | |
| tree | 4759b1bc65e703213178d7ab4ef7c1a80e713161 /source4/libnet/libnet.c | |
| parent | a15b6f1606e1c761c2c4037b734137e97f00489f (diff) | |
| parent | 68a2c547d00d7a8d0c15744172489d9d010c31a3 (diff) | |
| download | samba-18f8f5d6561d50b9179541ea24e03a5a807a2a2a.tar.gz samba-18f8f5d6561d50b9179541ea24e03a5a807a2a2a.tar.xz samba-18f8f5d6561d50b9179541ea24e03a5a807a2a2a.zip | |
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-gmake4
(This used to be commit 1ef3830bb0d6e91e3b00e880784ca0741d9b4d49)
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; |