summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
Diffstat (limited to 'source3')
-rw-r--r--source3/Makefile.in1
-rw-r--r--source3/winbindd/winbindd.c3
-rw-r--r--source3/winbindd/winbindd_getdcname.c88
-rw-r--r--source3/winbindd/winbindd_misc.c20
-rw-r--r--source3/winbindd/winbindd_proto.h8
5 files changed, 98 insertions, 22 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in
index 221b965cab..ac1b705b62 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -1203,6 +1203,7 @@ WINBINDD_OBJ1 = \
winbindd/winbindd_getpwent.o \
winbindd/winbindd_endpwent.o \
winbindd/winbindd_dsgetdcname.o \
+ winbindd/winbindd_getdcname.o \
auth/token_util.o \
../nsswitch/libwbclient/wb_reqtrans.o \
smbd/connection.o
diff --git a/source3/winbindd/winbindd.c b/source3/winbindd/winbindd.c
index 6485f1734c..a57412ab14 100644
--- a/source3/winbindd/winbindd.c
+++ b/source3/winbindd/winbindd.c
@@ -470,7 +470,6 @@ static struct winbindd_dispatch_table {
{ WINBINDD_NETBIOS_NAME, winbindd_netbios_name, "NETBIOS_NAME" },
{ WINBINDD_PRIV_PIPE_DIR, winbindd_priv_pipe_dir,
"WINBINDD_PRIV_PIPE_DIR" },
- { WINBINDD_GETDCNAME, winbindd_getdcname, "GETDCNAME" },
/* Credential cache access */
{ WINBINDD_CCACHE_NTLMAUTH, winbindd_ccache_ntlm_auth, "NTLMAUTH" },
@@ -539,6 +538,8 @@ static struct winbindd_async_dispatch_table async_nonpriv_table[] = {
winbindd_endpwent_send, winbindd_endpwent_recv },
{ WINBINDD_DSGETDCNAME, "DSGETDCNAME",
winbindd_dsgetdcname_send, winbindd_dsgetdcname_recv },
+ { WINBINDD_GETDCNAME, "GETDCNAME",
+ winbindd_getdcname_send, winbindd_getdcname_recv },
{ 0, NULL, NULL, NULL }
};
diff --git a/source3/winbindd/winbindd_getdcname.c b/source3/winbindd/winbindd_getdcname.c
new file mode 100644
index 0000000000..a4ed9925dd
--- /dev/null
+++ b/source3/winbindd/winbindd_getdcname.c
@@ -0,0 +1,88 @@
+/*
+ Unix SMB/CIFS implementation.
+ async implementation of WINBINDD_GETDCNAME
+ Copyright (C) Volker Lendecke 2009
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "includes.h"
+#include "winbindd.h"
+#include "librpc/gen_ndr/cli_wbint.h"
+
+struct winbindd_getdcname_state {
+ struct netr_DsRGetDCNameInfo *dcinfo;
+};
+
+static void winbindd_getdcname_done(struct tevent_req *subreq);
+
+struct tevent_req *winbindd_getdcname_send(TALLOC_CTX *mem_ctx,
+ struct tevent_context *ev,
+ struct winbindd_cli_state *cli,
+ struct winbindd_request *request)
+{
+ struct tevent_req *req, *subreq;
+ struct winbindd_getdcname_state *state;
+
+ req = tevent_req_create(mem_ctx, &state,
+ struct winbindd_getdcname_state);
+ if (req == NULL) {
+ return NULL;
+ }
+
+ request->domain_name[sizeof(request->domain_name)-1] = '\0';
+
+ DEBUG(3, ("[%5lu]: getdcname for %s\n", (unsigned long)cli->pid,
+ request->domain_name));
+
+ subreq = wb_dsgetdcname_send(state, ev, request->domain_name, NULL,
+ NULL, 0);
+ if (tevent_req_nomem(subreq, req)) {
+ return tevent_req_post(req, ev);
+ }
+ tevent_req_set_callback(subreq, winbindd_getdcname_done, req);
+ return req;
+}
+
+static void winbindd_getdcname_done(struct tevent_req *subreq)
+{
+ struct tevent_req *req = tevent_req_callback_data(
+ subreq, struct tevent_req);
+ struct winbindd_getdcname_state *state = tevent_req_data(
+ req, struct winbindd_getdcname_state);
+ NTSTATUS status;
+
+ status = wb_dsgetdcname_recv(subreq, state, &state->dcinfo);
+ TALLOC_FREE(subreq);
+ if (!NT_STATUS_IS_OK(status)) {
+ tevent_req_nterror(req, status);
+ return;
+ }
+ tevent_req_done(req);
+}
+
+NTSTATUS winbindd_getdcname_recv(struct tevent_req *req,
+ struct winbindd_response *response)
+{
+ struct winbindd_getdcname_state *state = tevent_req_data(
+ req, struct winbindd_getdcname_state);
+ NTSTATUS status;
+
+ if (tevent_req_is_nterror(req, &status)) {
+ DEBUG(5, ("getdcname failed: %s\n", nt_errstr(status)));
+ return status;
+ }
+ fstrcpy(response->data.dc_name, strip_hostname(state->dcinfo->dc_unc));
+ return NT_STATUS_OK;
+}
diff --git a/source3/winbindd/winbindd_misc.c b/source3/winbindd/winbindd_misc.c
index 7b10911434..beaf450743 100644
--- a/source3/winbindd/winbindd_misc.c
+++ b/source3/winbindd/winbindd_misc.c
@@ -414,26 +414,6 @@ enum winbindd_result winbindd_dual_list_trusted_domains(struct winbindd_domain *
return WINBINDD_OK;
}
-void winbindd_getdcname(struct winbindd_cli_state *state)
-{
- struct winbindd_domain *domain;
-
- state->request->domain_name
- [sizeof(state->request->domain_name)-1] = '\0';
-
- DEBUG(3, ("[%5lu]: Get DC name for %s\n", (unsigned long)state->pid,
- state->request->domain_name));
-
- domain = find_domain_from_name_noinit(state->request->domain_name);
- if (domain && domain->internal) {
- fstrcpy(state->response->data.dc_name, global_myname());
- request_ok(state);
- return;
- }
-
- sendto_domain(state, find_our_domain());
-}
-
enum winbindd_result winbindd_dual_getdcname(struct winbindd_domain *domain,
struct winbindd_cli_state *state)
{
diff --git a/source3/winbindd/winbindd_proto.h b/source3/winbindd/winbindd_proto.h
index bf1e8a297d..930d48b458 100644
--- a/source3/winbindd/winbindd_proto.h
+++ b/source3/winbindd/winbindd_proto.h
@@ -447,7 +447,6 @@ void winbindd_list_ent(struct winbindd_cli_state *state, enum ent_type type);
void winbindd_list_trusted_domains(struct winbindd_cli_state *state);
enum winbindd_result winbindd_dual_list_trusted_domains(struct winbindd_domain *domain,
struct winbindd_cli_state *state);
-void winbindd_getdcname(struct winbindd_cli_state *state);
enum winbindd_result winbindd_dual_getdcname(struct winbindd_domain *domain,
struct winbindd_cli_state *state);
void winbindd_show_sequence(struct winbindd_cli_state *state);
@@ -905,4 +904,11 @@ struct tevent_req *wb_dsgetdcname_send(TALLOC_CTX *mem_ctx,
NTSTATUS wb_dsgetdcname_recv(struct tevent_req *req, TALLOC_CTX *mem_ctx,
struct netr_DsRGetDCNameInfo **pdcinfo);
+struct tevent_req *winbindd_getdcname_send(TALLOC_CTX *mem_ctx,
+ struct tevent_context *ev,
+ struct winbindd_cli_state *cli,
+ struct winbindd_request *request);
+NTSTATUS winbindd_getdcname_recv(struct tevent_req *req,
+ struct winbindd_response *response);
+
#endif /* _WINBINDD_PROTO_H_ */
generated by cgit (git 2.34.1) at 2024-11-25 02:05:59 +0000