winbindd: winbindd_netbios_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 1d820f26d7b360d2d9fda534bbac73cfc69ee656..714663b7c9f317de31b649b3a6f32fa5bcb625a4 100644 (file)
--- a/source3/winbindd/winbindd.c
+++ b/source3/winbindd/winbindd.c
@@ -536,7 +536,6 @@ static struct winbindd_dispatch_table {
 
        { WINBINDD_DOMAIN_INFO, winbindd_domain_info, "DOMAIN_INFO" },
        { WINBINDD_DC_INFO, winbindd_dc_info, "DC_INFO" },
-       { WINBINDD_NETBIOS_NAME, winbindd_netbios_name, "NETBIOS_NAME" },
        { WINBINDD_PRIV_PIPE_DIR, winbindd_priv_pipe_dir,
          "WINBINDD_PRIV_PIPE_DIR" },
 
@@ -566,6 +565,9 @@ static struct winbindd_bool_dispatch_table {
        { WINBINDD_DOMAIN_NAME,
          winbindd_domain_name,
          "DOMAIN_NAME" },
+       { WINBINDD_NETBIOS_NAME,
+         winbindd_netbios_name,
+         "NETBIOS_NAME" },
 };
 
 struct winbindd_async_dispatch_table {

diff --git a/source3/winbindd/winbindd_misc.c b/source3/winbindd/winbindd_misc.c
index 45dabc3843b4579e557c670a50f141694f4b54f1..db73784bff849ab81e7a9f792964bfdd1dd68137 100644 (file)
--- a/source3/winbindd/winbindd_misc.c
+++ b/source3/winbindd/winbindd_misc.c
@@ -543,13 +543,13 @@ bool winbindd_domain_name(struct winbindd_cli_state *state)
 
 /* What's my name again? */
 
-void winbindd_netbios_name(struct winbindd_cli_state *state)
+bool winbindd_netbios_name(struct winbindd_cli_state *state)
 {
        DEBUG(3, ("[%5lu]: request netbios name\n",
                  (unsigned long)state->pid));
 
        fstrcpy(state->response->data.netbios_name, lp_netbios_name());
-       request_ok(state);
+       return true;
 }
 
 /* Where can I find the privileged pipe? */

diff --git a/source3/winbindd/winbindd_proto.h b/source3/winbindd/winbindd_proto.h
index cc1677e622f0a8c123fc27b65489904a467f863f..e6ffee1bacb6d357b0d4a304e2ace7c0a235a30a 100644 (file)
--- a/source3/winbindd/winbindd_proto.h
+++ b/source3/winbindd/winbindd_proto.h
@@ -391,7 +391,7 @@ 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);
 bool winbindd_domain_name(struct winbindd_cli_state *state);
-void winbindd_netbios_name(struct winbindd_cli_state *state);
+bool winbindd_netbios_name(struct winbindd_cli_state *state);
 void winbindd_priv_pipe_dir(struct winbindd_cli_state *state);
 
 /* The following definitions come from winbindd/winbindd_ndr.c  */