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 d658d8a6ac3330c95f577d053c9aa09a6f417b4a..a89962add92c6d75c0cdd5b3756fc1c08e73e8f6 100644 (file)
--- 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 d6efce2d68434a11ffc4c514893f3daa3025eee5..315b0a3fcd3a81687acd33adb560f639566f25ec 100644 (file)
--- 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 b5e4ecfe5c0896140a54382cc3e83c767f18f7a3..90565333e1a4d8f0e9f0549da0580510c37397d4 100644 (file)
--- 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);