From 762d8ab7595cffd6fda79fd4efabf388f6bc3d13 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Wed, 2 May 2018 18:25:00 +0200 Subject: winbindd: winbindd_netbios_name() -> bool_dispatch_table Signed-off-by: Volker Lendecke Reviewed-by: Stefan Metzmacher --- source3/winbindd/winbindd.c | 4 +++- source3/winbindd/winbindd_misc.c | 4 ++-- source3/winbindd/winbindd_proto.h | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/source3/winbindd/winbindd.c b/source3/winbindd/winbindd.c index 1d820f26d7b..714663b7c9f 100644 --- a/source3/winbindd/winbindd.c +++ b/source3/winbindd/winbindd.c @@ -536,7 +536,6 @@ static struct winbindd_dispatch_table { { WINBINDD_DOMAIN_INFO, winbindd_domain_info, "DOMAIN_INFO" }, { WINBINDD_DC_INFO, winbindd_dc_info, "DC_INFO" }, - { WINBINDD_NETBIOS_NAME, winbindd_netbios_name, "NETBIOS_NAME" }, { WINBINDD_PRIV_PIPE_DIR, winbindd_priv_pipe_dir, "WINBINDD_PRIV_PIPE_DIR" }, @@ -566,6 +565,9 @@ static struct winbindd_bool_dispatch_table { { WINBINDD_DOMAIN_NAME, winbindd_domain_name, "DOMAIN_NAME" }, + { WINBINDD_NETBIOS_NAME, + winbindd_netbios_name, + "NETBIOS_NAME" }, }; struct winbindd_async_dispatch_table { diff --git a/source3/winbindd/winbindd_misc.c b/source3/winbindd/winbindd_misc.c index 45dabc3843b..db73784bff8 100644 --- a/source3/winbindd/winbindd_misc.c +++ b/source3/winbindd/winbindd_misc.c @@ -543,13 +543,13 @@ bool winbindd_domain_name(struct winbindd_cli_state *state) /* What's my name again? */ -void winbindd_netbios_name(struct winbindd_cli_state *state) +bool winbindd_netbios_name(struct winbindd_cli_state *state) { DEBUG(3, ("[%5lu]: request netbios name\n", (unsigned long)state->pid)); fstrcpy(state->response->data.netbios_name, lp_netbios_name()); - request_ok(state); + return true; } /* Where can I find the privileged pipe? */ diff --git a/source3/winbindd/winbindd_proto.h b/source3/winbindd/winbindd_proto.h index cc1677e622f..e6ffee1bacb 100644 --- a/source3/winbindd/winbindd_proto.h +++ b/source3/winbindd/winbindd_proto.h @@ -391,7 +391,7 @@ bool winbindd_ping(struct winbindd_cli_state *state); bool winbindd_info(struct winbindd_cli_state *state); bool winbindd_interface_version(struct winbindd_cli_state *state); bool winbindd_domain_name(struct winbindd_cli_state *state); -void winbindd_netbios_name(struct winbindd_cli_state *state); +bool winbindd_netbios_name(struct winbindd_cli_state *state); void winbindd_priv_pipe_dir(struct winbindd_cli_state *state); /* The following definitions come from winbindd/winbindd_ndr.c */ -- cgit v1.2.1