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 a89962add92c6d75c0cdd5b3756fc1c08e73e8f6..62944037be55bd27f1d665608a0203f73138b788 100644 (file)
--- 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 315b0a3fcd3a81687acd33adb560f639566f25ec..99aed9c1a3f36416aa890adee12f391a788b258f 100644 (file)
--- 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 90565333e1a4d8f0e9f0549da0580510c37397d4..b947baa08d565beae8559169fd8f981f378837c7 100644 (file)
--- 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);