From: Volker Lendecke <vl@samba.org>
Date: Wed, 2 May 2018 14:36:49 +0000 (+0200)
Subject: winbindd: winbindd_info() -> bool_dispatch_table
X-Git-Tag: ldb-1.4.0~158
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=25c365c637776ef2a1fbab1c2ca46dcb7c21bfff;p=thirdparty%2Fsamba.git

winbindd: winbindd_info() -> 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 d658d8a6ac3..a89962add92 100644
--- a/source3/winbindd/winbindd.c
+++ b/source3/winbindd/winbindd.c
@@ -534,7 +534,6 @@ static struct winbindd_dispatch_table {
 
 	/* Miscellaneous */
 
-	{ WINBINDD_INFO, winbindd_info, "INFO" },
 	{ WINBINDD_PING, winbindd_ping, "PING" },
 	{ WINBINDD_DOMAIN_NAME, winbindd_domain_name, "DOMAIN_NAME" },
 	{ WINBINDD_DOMAIN_INFO, winbindd_domain_info, "DOMAIN_INFO" },
@@ -560,6 +559,9 @@ static struct winbindd_bool_dispatch_table {
 	{ WINBINDD_INTERFACE_VERSION,
 	  winbindd_interface_version,
 	  "INTERFACE_VERSION" },
+	{ WINBINDD_INFO,
+	  winbindd_info,
+	  "INFO" },
 };
 
 struct winbindd_async_dispatch_table {
diff --git a/source3/winbindd/winbindd_misc.c b/source3/winbindd/winbindd_misc.c
index d6efce2d684..315b0a3fcd3 100644
--- a/source3/winbindd/winbindd_misc.c
+++ b/source3/winbindd/winbindd_misc.c
@@ -510,14 +510,14 @@ void winbindd_ping(struct winbindd_cli_state *state)
 
 /* List various tidbits of information */
 
-void winbindd_info(struct winbindd_cli_state *state)
+bool winbindd_info(struct winbindd_cli_state *state)
 {
 
 	DEBUG(3, ("[%5lu]: request misc info\n", (unsigned long)state->pid));
 
 	state->response->data.info.winbind_separator = *lp_winbind_separator();
 	fstrcpy(state->response->data.info.samba_version, samba_version_string());
-	request_ok(state);
+	return true;
 }
 
 /* Tell the client the current interface version */
diff --git a/source3/winbindd/winbindd_proto.h b/source3/winbindd/winbindd_proto.h
index b5e4ecfe5c0..90565333e1a 100644
--- a/source3/winbindd/winbindd_proto.h
+++ b/source3/winbindd/winbindd_proto.h
@@ -388,7 +388,7 @@ void winbindd_show_sequence(struct winbindd_cli_state *state);
 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);
+bool winbindd_info(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);