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

winbindd: winbindd_ping() -> 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 a89962add92..62944037be5 100644
--- a/source3/winbindd/winbindd.c
+++ b/source3/winbindd/winbindd.c
@@ -534,7 +534,6 @@ static struct winbindd_dispatch_table {
 
 	/* Miscellaneous */
 
-	{ WINBINDD_PING, winbindd_ping, "PING" },
 	{ WINBINDD_DOMAIN_NAME, winbindd_domain_name, "DOMAIN_NAME" },
 	{ WINBINDD_DOMAIN_INFO, winbindd_domain_info, "DOMAIN_INFO" },
 	{ WINBINDD_DC_INFO, winbindd_dc_info, "DC_INFO" },
@@ -562,6 +561,9 @@ static struct winbindd_bool_dispatch_table {
 	{ WINBINDD_INFO,
 	  winbindd_info,
 	  "INFO" },
+	{ WINBINDD_PING,
+	  winbindd_ping,
+	  "PING" },
 };
 
 struct winbindd_async_dispatch_table {
diff --git a/source3/winbindd/winbindd_misc.c b/source3/winbindd/winbindd_misc.c
index 315b0a3fcd3..99aed9c1a3f 100644
--- a/source3/winbindd/winbindd_misc.c
+++ b/source3/winbindd/winbindd_misc.c
@@ -502,10 +502,10 @@ void winbindd_dc_info(struct winbindd_cli_state *cli)
 	request_ok(cli);
 }
 
-void winbindd_ping(struct winbindd_cli_state *state)
+bool winbindd_ping(struct winbindd_cli_state *state)
 {
 	DEBUG(3, ("[%5lu]: ping\n", (unsigned long)state->pid));
-	request_ok(state);
+	return true;
 }
 
 /* List various tidbits of information */
diff --git a/source3/winbindd/winbindd_proto.h b/source3/winbindd/winbindd_proto.h
index 90565333e1a..b947baa08d5 100644
--- a/source3/winbindd/winbindd_proto.h
+++ b/source3/winbindd/winbindd_proto.h
@@ -387,7 +387,7 @@ enum winbindd_result winbindd_dual_list_trusted_domains(struct winbindd_domain *
 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);
+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);
 void winbindd_domain_name(struct winbindd_cli_state *state);