From: Volker Lendecke <vl@samba.org>
Date: Wed, 2 May 2018 13:26:55 +0000 (+0200)
Subject: winbindd: winbindd_interface_version() -> bool_dispatch_table
X-Git-Tag: ldb-1.4.0~159
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=214d78a6fab55eac3a80e06daaf91763da135f49;p=thirdparty%2Fsamba.git

winbindd: winbindd_interface_version() -> bool_dispatch_table

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
---

diff --git a/source3/winbindd/winbindd.c b/source3/winbindd/winbindd.c
index f9bea96bf97..d658d8a6ac3 100644
--- a/source3/winbindd/winbindd.c
+++ b/source3/winbindd/winbindd.c
@@ -536,8 +536,6 @@ static struct winbindd_dispatch_table {
 
 	{ WINBINDD_INFO, winbindd_info, "INFO" },
 	{ WINBINDD_PING, winbindd_ping, "PING" },
-	{ WINBINDD_INTERFACE_VERSION, winbindd_interface_version,
-	  "INTERFACE_VERSION" },
 	{ WINBINDD_DOMAIN_NAME, winbindd_domain_name, "DOMAIN_NAME" },
 	{ WINBINDD_DOMAIN_INFO, winbindd_domain_info, "DOMAIN_INFO" },
 	{ WINBINDD_DC_INFO, winbindd_dc_info, "DC_INFO" },
@@ -559,6 +557,9 @@ static struct winbindd_bool_dispatch_table {
 	bool (*fn)(struct winbindd_cli_state *state);
 	const char *cmd_name;
 } bool_dispatch_table[] = {
+	{ WINBINDD_INTERFACE_VERSION,
+	  winbindd_interface_version,
+	  "INTERFACE_VERSION" },
 };
 
 struct winbindd_async_dispatch_table {
diff --git a/source3/winbindd/winbindd_misc.c b/source3/winbindd/winbindd_misc.c
index c101269e93a..d6efce2d684 100644
--- a/source3/winbindd/winbindd_misc.c
+++ b/source3/winbindd/winbindd_misc.c
@@ -522,13 +522,13 @@ void winbindd_info(struct winbindd_cli_state *state)
 
 /* Tell the client the current interface version */
 
-void winbindd_interface_version(struct winbindd_cli_state *state)
+bool winbindd_interface_version(struct winbindd_cli_state *state)
 {
 	DEBUG(3, ("[%5lu]: request interface version (version = %d)\n",
 		  (unsigned long)state->pid, WINBIND_INTERFACE_VERSION));
 
 	state->response->data.interface_version = WINBIND_INTERFACE_VERSION;
-	request_ok(state);
+	return true;
 }
 
 /* What domain are we a member of? */
diff --git a/source3/winbindd/winbindd_proto.h b/source3/winbindd/winbindd_proto.h
index 9b3fadf4c98..b5e4ecfe5c0 100644
--- a/source3/winbindd/winbindd_proto.h
+++ b/source3/winbindd/winbindd_proto.h
@@ -389,7 +389,7 @@ void winbindd_domain_info(struct winbindd_cli_state *state);
 void winbindd_dc_info(struct winbindd_cli_state *state);
 void winbindd_ping(struct winbindd_cli_state *state);
 void winbindd_info(struct winbindd_cli_state *state);
-void winbindd_interface_version(struct winbindd_cli_state *state);
+bool winbindd_interface_version(struct winbindd_cli_state *state);
 void winbindd_domain_name(struct winbindd_cli_state *state);
 void winbindd_netbios_name(struct winbindd_cli_state *state);
 void winbindd_priv_pipe_dir(struct winbindd_cli_state *state);