winbindd: winbindd_domain_name() -> 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 62944037be55bd27f1d665608a0203f73138b788..1d820f26d7b360d2d9fda534bbac73cfc69ee656 100644 (file)
--- a/source3/winbindd/winbindd.c
+++ b/source3/winbindd/winbindd.c
@@ -534,7 +534,6 @@ static struct winbindd_dispatch_table {
 
        /* Miscellaneous */
 
-       { WINBINDD_DOMAIN_NAME, winbindd_domain_name, "DOMAIN_NAME" },
        { WINBINDD_DOMAIN_INFO, winbindd_domain_info, "DOMAIN_INFO" },
        { WINBINDD_DC_INFO, winbindd_dc_info, "DC_INFO" },
        { WINBINDD_NETBIOS_NAME, winbindd_netbios_name, "NETBIOS_NAME" },
@@ -564,6 +563,9 @@ static struct winbindd_bool_dispatch_table {
        { WINBINDD_PING,
          winbindd_ping,
          "PING" },
+       { WINBINDD_DOMAIN_NAME,
+         winbindd_domain_name,
+         "DOMAIN_NAME" },
 };
 
 struct winbindd_async_dispatch_table {

diff --git a/source3/winbindd/winbindd_misc.c b/source3/winbindd/winbindd_misc.c
index 99aed9c1a3f36416aa890adee12f391a788b258f..45dabc3843b4579e557c670a50f141694f4b54f1 100644 (file)
--- a/source3/winbindd/winbindd_misc.c
+++ b/source3/winbindd/winbindd_misc.c
@@ -533,12 +533,12 @@ bool winbindd_interface_version(struct winbindd_cli_state *state)
 
 /* What domain are we a member of? */
 
-void winbindd_domain_name(struct winbindd_cli_state *state)
+bool winbindd_domain_name(struct winbindd_cli_state *state)
 {
        DEBUG(3, ("[%5lu]: request domain name\n", (unsigned long)state->pid));
 
        fstrcpy(state->response->data.domain_name, lp_workgroup());
-       request_ok(state);
+       return true;
 }
 
 /* What's my name again? */

diff --git a/source3/winbindd/winbindd_proto.h b/source3/winbindd/winbindd_proto.h
index b947baa08d565beae8559169fd8f981f378837c7..cc1677e622f0a8c123fc27b65489904a467f863f 100644 (file)
--- a/source3/winbindd/winbindd_proto.h
+++ b/source3/winbindd/winbindd_proto.h
@@ -390,7 +390,7 @@ void winbindd_dc_info(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);
+bool 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);