winbindd: winbindd_interface_version() -> bool_dispatch_table
authorVolker Lendecke <vl@samba.org>
Wed, 2 May 2018 13:26:55 +0000 (15:26 +0200)
committerVolker Lendecke <vl@samba.org>
Thu, 17 May 2018 06:44:18 +0000 (08:44 +0200)
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
source3/winbindd/winbindd.c
source3/winbindd/winbindd_misc.c
source3/winbindd/winbindd_proto.h

index f9bea96bf973612334b60ecb7b21cb37643f0f88..d658d8a6ac3330c95f577d053c9aa09a6f417b4a 100644 (file)
@@ -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 {
index c101269e93afcb8f9ed500b359803d4f87b2ee85..d6efce2d68434a11ffc4c514893f3daa3025eee5 100644 (file)
@@ -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? */
index 9b3fadf4c9813aeb251a7d29807dda379f34fec8..b5e4ecfe5c0896140a54382cc3e83c767f18f7a3 100644 (file)
@@ -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);