diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2008-05-15 08:08:43 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2008-05-15 08:08:43 +1000 |
| commit | d55e57ca99de4c094113c18bf18179923f641887 (patch) | |
| tree | d16297afd1b1c1a58082acbdf3cc41c8da6916ec /source4/libcli | |
| parent | ff7c537e278194453311ce9a310a8e24cb410d32 (diff) | |
| parent | 8113bb07a8eaee2bce1290bff1f06856bc7c76e6 (diff) | |
| download | samba-d55e57ca99de4c094113c18bf18179923f641887.tar.gz samba-d55e57ca99de4c094113c18bf18179923f641887.tar.xz samba-d55e57ca99de4c094113c18bf18179923f641887.zip | |
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local
(This used to be commit 618400fe7d1f469150b82e0aebc89b2104de116f)
Diffstat (limited to 'source4/libcli')
| -rw-r--r-- | source4/libcli/resolve/resolve.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/source4/libcli/resolve/resolve.c b/source4/libcli/resolve/resolve.c index aaf9ff1f8db..d89b50e430f 100644 --- a/source4/libcli/resolve/resolve.c +++ b/source4/libcli/resolve/resolve.c @@ -137,8 +137,7 @@ struct composite_context *resolve_name_send(struct resolve_context *ctx, struct resolve_state *state; if (ctx == NULL || event_ctx == NULL) { - composite_error(c, NT_STATUS_INVALID_PARAMETER); - return c; + return NULL; } c = composite_create(ctx, event_ctx); |