From ffeb2acf65ef0b669f57b3f6f047db03b2f1a6c6 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Wed, 18 Apr 2018 17:29:51 +0200 Subject: [PATCH] winbind: Speed up wbinfo -p This was (possibly) used as an example in the early days of the async winbind code we have today. It's not necessary to send this through a full tevent_req round. Signed-off-by: Volker Lendecke Reviewed-by: Stefan Metzmacher Autobuild-User(master): Volker Lendecke Autobuild-Date(master): Tue Apr 24 17:18:23 CEST 2018 on sn-devel-144 --- source3/winbindd/wb_ping.c | 46 ------------------------------- source3/winbindd/winbindd.c | 3 +- source3/winbindd/winbindd_misc.c | 6 ++++ source3/winbindd/winbindd_proto.h | 6 ---- source3/winbindd/wscript_build | 1 - 5 files changed, 7 insertions(+), 55 deletions(-) delete mode 100644 source3/winbindd/wb_ping.c diff --git a/source3/winbindd/wb_ping.c b/source3/winbindd/wb_ping.c deleted file mode 100644 index bfba3c168bb..00000000000 --- a/source3/winbindd/wb_ping.c +++ /dev/null @@ -1,46 +0,0 @@ -/* - Unix SMB/CIFS implementation. - async implementation of WINBINDD_PING - Copyright (C) Volker Lendecke 2009 - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . -*/ - -#include "includes.h" -#include "winbindd.h" - -struct wb_ping_state { - uint8_t dummy; -}; - -struct tevent_req *wb_ping_send(TALLOC_CTX *mem_ctx, struct tevent_context *ev, - struct winbindd_cli_state *cli, - struct winbindd_request *request) -{ - struct tevent_req *req; - struct wb_ping_state *state; - - req = tevent_req_create(mem_ctx, &state, struct wb_ping_state); - if (req == NULL) { - return NULL; - } - tevent_req_done(req); - tevent_req_post(req, ev); - return req; -} - -NTSTATUS wb_ping_recv(struct tevent_req *req, struct winbindd_response *presp) -{ - return NT_STATUS_OK; -} diff --git a/source3/winbindd/winbindd.c b/source3/winbindd/winbindd.c index b908d91e206..76d644b1ba6 100644 --- a/source3/winbindd/winbindd.c +++ b/source3/winbindd/winbindd.c @@ -535,6 +535,7 @@ static struct winbindd_dispatch_table { /* Miscellaneous */ { 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" }, @@ -565,8 +566,6 @@ struct winbindd_async_dispatch_table { }; static struct winbindd_async_dispatch_table async_nonpriv_table[] = { - { WINBINDD_PING, "PING", - wb_ping_send, wb_ping_recv }, { WINBINDD_LOOKUPSID, "LOOKUPSID", winbindd_lookupsid_send, winbindd_lookupsid_recv }, { WINBINDD_LOOKUPSIDS, "LOOKUPSIDS", diff --git a/source3/winbindd/winbindd_misc.c b/source3/winbindd/winbindd_misc.c index 964190e7c62..c101269e93a 100644 --- a/source3/winbindd/winbindd_misc.c +++ b/source3/winbindd/winbindd_misc.c @@ -502,6 +502,12 @@ void winbindd_dc_info(struct winbindd_cli_state *cli) request_ok(cli); } +void winbindd_ping(struct winbindd_cli_state *state) +{ + DEBUG(3, ("[%5lu]: ping\n", (unsigned long)state->pid)); + request_ok(state); +} + /* List various tidbits of information */ void winbindd_info(struct winbindd_cli_state *state) diff --git a/source3/winbindd/winbindd_proto.h b/source3/winbindd/winbindd_proto.h index 6a63b151720..bbc6841e004 100644 --- a/source3/winbindd/winbindd_proto.h +++ b/source3/winbindd/winbindd_proto.h @@ -529,12 +529,6 @@ bool parse_xidlist(TALLOC_CTX *mem_ctx, const char *xidstr, void winbindd_wins_byname(struct winbindd_cli_state *state); -struct tevent_req *wb_ping_send(TALLOC_CTX *mem_ctx, struct tevent_context *ev, - struct winbindd_cli_state *cli, - struct winbindd_request *request); -NTSTATUS wb_ping_recv(struct tevent_req *req, - struct winbindd_response *resp); - enum winbindd_result winbindd_dual_ping(struct winbindd_domain *domain, struct winbindd_cli_state *state); diff --git a/source3/winbindd/wscript_build b/source3/winbindd/wscript_build index 48250ea565e..0adbe9cbba1 100644 --- a/source3/winbindd/wscript_build +++ b/source3/winbindd/wscript_build @@ -198,7 +198,6 @@ bld.SAMBA3_BINARY('winbindd', winbindd_idmap.c winbindd_locator.c winbindd_ndr.c - wb_ping.c wb_lookupsid.c wb_lookupsids.c wb_lookupname.c -- 2.34.1