diff options
| author | Volker Lendecke <vlendec@samba.org> | 2005-01-06 15:35:02 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 10:53:47 -0500 |
| commit | c85d9e735c8294088203f1656ae07a4b0835292c (patch) | |
| tree | b425600689792bcee9fe21e46f2aa8dfdb0eb291 /source3/utils | |
| parent | f4ec52a0978dca900942e6001947e3b3d58eccd2 (diff) | |
| download | samba-c85d9e735c8294088203f1656ae07a4b0835292c.tar.gz samba-c85d9e735c8294088203f1656ae07a4b0835292c.tar.bz2 samba-c85d9e735c8294088203f1656ae07a4b0835292c.zip | |
r4570: Replace cli->nt_pipe_fnum with an array of NT file numbers, one for each
supported pipe. Netlogon is still special, as we open that twice, one to do
the auth2, the other one with schannel.
The client interface is completely unchanged for those who only use a single
pie. cli->pipe_idx is used as the index for everything except the "real"
client rpc calls, which have been explicitly converted in my last commit. Next
step is to get winbind to just use a single smb connection for multiple pipes.
Volker
(This used to be commit dc294c52e0216424236057ca6cd35e1ebf51d0da)
Diffstat (limited to 'source3/utils')
| -rw-r--r-- | source3/utils/net_rpc.c | 6 | ||||
| -rw-r--r-- | source3/utils/net_rpc_join.c | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/source3/utils/net_rpc.c b/source3/utils/net_rpc.c index 4c5544aa97..aa25d6816d 100644 --- a/source3/utils/net_rpc.c +++ b/source3/utils/net_rpc.c @@ -145,7 +145,7 @@ static int run_rpc_command(struct cli_state *cli_arg, const int pipe_idx, int co } if (!(conn_flags & NET_FLAGS_NO_PIPE)) { - if (cli->nt_pipe_fnum) + if (cli->nt_pipe_fnum[cli->pipe_idx]) cli_nt_session_close(cli); } @@ -4437,7 +4437,7 @@ static int rpc_trustdom_establish(int argc, const char **argv) return -1; } - if (cli->nt_pipe_fnum) + if (cli->nt_pipe_fnum[cli->pipe_idx]) cli_nt_session_close(cli); @@ -4504,7 +4504,7 @@ static int rpc_trustdom_establish(int argc, const char **argv) return -1; } - if (cli->nt_pipe_fnum) + if (cli->nt_pipe_fnum[cli->pipe_idx]) cli_nt_session_close(cli); talloc_destroy(mem_ctx); diff --git a/source3/utils/net_rpc_join.c b/source3/utils/net_rpc_join.c index 79c632f831..f1a41c7c99 100644 --- a/source3/utils/net_rpc_join.c +++ b/source3/utils/net_rpc_join.c @@ -78,7 +78,7 @@ static int net_rpc_join_ok(const char *domain) done: /* Close down pipe - this will clean up open policy handles */ - if (cli->nt_pipe_fnum) + if (cli->nt_pipe_fnum[cli->pipe_idx]) cli_nt_session_close(cli); cli_shutdown(cli); @@ -347,7 +347,7 @@ int net_rpc_join_newstyle(int argc, const char **argv) done: /* Close down pipe - this will clean up open policy handles */ - if (cli->nt_pipe_fnum) + if (cli->nt_pipe_fnum[cli->pipe_idx]) cli_nt_session_close(cli); /* Display success or failure */ |