diff options
| author | bubulle <bubulle@alioth.debian.org> | 2008-11-01 11:09:46 +0000 |
|---|---|---|
| committer | bubulle <bubulle@alioth.debian.org> | 2008-11-01 11:09:46 +0000 |
| commit | a2b71a0141763c20552bb45eeb4cb78c4b513118 (patch) | |
| tree | 85b64d98387145ea4e00c1b529e1820542a979a3 /source/lib/netapi/getdc.c | |
| parent | 2203bd59918d6d70515f9dad601cb5c0ef098092 (diff) | |
| download | samba-a2b71a0141763c20552bb45eeb4cb78c4b513118.tar.gz | |
Revert the merge of 3.3.0~pre2 in upstream branch
git-svn-id: svn://svn.debian.org/svn/pkg-samba/branches/samba/upstream@2200 fc4039ab-9d04-0410-8cac-899223bdd6b0
Diffstat (limited to 'source/lib/netapi/getdc.c')
| -rw-r--r-- | source/lib/netapi/getdc.c | 34 |
1 files changed, 20 insertions, 14 deletions
diff --git a/source/lib/netapi/getdc.c b/source/lib/netapi/getdc.c index 07a6544af1..c1d021b1d4 100644 --- a/source/lib/netapi/getdc.c +++ b/source/lib/netapi/getdc.c @@ -31,7 +31,7 @@ WERROR NetGetDCName_l(struct libnetapi_ctx *ctx, struct NetGetDCName *r) { - LIBNETAPI_REDIRECT_TO_LOCALHOST(ctx, r, NetGetDCName); + return WERR_NOT_SUPPORTED; } /******************************************************************** @@ -45,10 +45,12 @@ WERROR NetGetDCName_r(struct libnetapi_ctx *ctx, NTSTATUS status; WERROR werr; - werr = libnetapi_open_pipe(ctx, r->in.server_name, - &ndr_table_netlogon.syntax_id, - &cli, - &pipe_cli); + werr = libnetapi_open_ipc_connection(ctx, r->in.server_name, &cli); + if (!W_ERROR_IS_OK(werr)) { + goto done; + } + + werr = libnetapi_open_pipe(ctx, cli, PI_NETLOGON, &pipe_cli); if (!W_ERROR_IS_OK(werr)) { goto done; } @@ -69,7 +71,7 @@ WERROR NetGetDCName_r(struct libnetapi_ctx *ctx, WERROR NetGetAnyDCName_l(struct libnetapi_ctx *ctx, struct NetGetAnyDCName *r) { - LIBNETAPI_REDIRECT_TO_LOCALHOST(ctx, r, NetGetAnyDCName); + return WERR_NOT_SUPPORTED; } /******************************************************************** @@ -83,10 +85,12 @@ WERROR NetGetAnyDCName_r(struct libnetapi_ctx *ctx, NTSTATUS status; WERROR werr; - werr = libnetapi_open_pipe(ctx, r->in.server_name, - &ndr_table_netlogon.syntax_id, - &cli, - &pipe_cli); + werr = libnetapi_open_ipc_connection(ctx, r->in.server_name, &cli); + if (!W_ERROR_IS_OK(werr)) { + goto done; + } + + werr = libnetapi_open_pipe(ctx, cli, PI_NETLOGON, &pipe_cli); if (!W_ERROR_IS_OK(werr)) { goto done; } @@ -140,10 +144,12 @@ WERROR DsGetDcName_r(struct libnetapi_ctx *ctx, struct cli_state *cli = NULL; struct rpc_pipe_client *pipe_cli = NULL; - werr = libnetapi_open_pipe(ctx, r->in.server_name, - &ndr_table_netlogon.syntax_id, - &cli, - &pipe_cli); + werr = libnetapi_open_ipc_connection(ctx, r->in.server_name, &cli); + if (!W_ERROR_IS_OK(werr)) { + goto done; + } + + werr = libnetapi_open_pipe(ctx, cli, PI_NETLOGON, &pipe_cli); if (!W_ERROR_IS_OK(werr)) { goto done; } |