diff options
| author | Karolin Seeger <kseeger@samba.org> | 2014-07-28 09:13:45 +0200 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2014-07-28 09:18:00 +0200 |
| commit | fcc634b483255bedf53f3aea40334c018e13dcce (patch) | |
| tree | 7d59833bd515e295e70ec188e1aa2b1436b3355c /source4/rpc_server/dcerpc_server.c | |
| parent | 97d7291d12e803076022d71556c792b0cd4e60e8 (diff) | |
| parent | 80a1dfddf9086700a8de5fd6005a9179b0bb3d9e (diff) | |
| download | samba-2cd741d5ceefd9e0771f5ea4891bc93baa48a165.tar.gz | |
Merge commit 'origin/v4-1-test^' into v4-1-stablesamba-4.1.10
This was needed because of a changed commit message (fixed version number)
in v4-1-stable after generating the 'samba-4.1.9' tag.
Karolin
Signed-off-by: Karolin Seeger <kseeger@samba.org>
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Diffstat (limited to 'source4/rpc_server/dcerpc_server.c')
| -rw-r--r-- | source4/rpc_server/dcerpc_server.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/source4/rpc_server/dcerpc_server.c b/source4/rpc_server/dcerpc_server.c index e41c0556f3f..ad53685be02 100644 --- a/source4/rpc_server/dcerpc_server.c +++ b/source4/rpc_server/dcerpc_server.c @@ -1741,13 +1741,19 @@ static NTSTATUS dcesrv_add_ep_tcp(struct dcesrv_context *dce_ctx, } else { char **wcard; int i; + int num_binds = 0; wcard = iface_list_wildcard(dce_ctx); NT_STATUS_HAVE_NO_MEMORY(wcard); for (i=0; wcard[i]; i++) { status = add_socket_rpc_tcp_iface(dce_ctx, e, event_ctx, model_ops, wcard[i]); - NT_STATUS_NOT_OK_RETURN(status); + if (NT_STATUS_IS_OK(status)) { + num_binds++; + } } talloc_free(wcard); + if (num_binds == 0) { + return NT_STATUS_INVALID_PARAMETER_MIX; + } } return NT_STATUS_OK; |