winbindd: winbindd_netbios_name() -> bool_dispatch_table

Signed-off-by: Volker Lendecke <[email protected]> Reviewed-by: Stefan Metzmacher <[email protected]>
noelpower · May 17, 2018 · 762d8ab · 762d8ab
1 parent 05105ea
commit 762d8ab
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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  */