From: Volker Lendecke Date: Tue, 4 Feb 2014 10:18:48 +0000 (+0000) Subject: auth4: Remove unused wbc_context X-Git-Url: http://git.samba.org/?p=obnox%2Fsamba%2Fsamba-obnox.git;a=commitdiff_plain;h=6b04558c5e0547a807ac0fcb5eeb1085cfe602ac auth4: Remove unused wbc_context Signed-off-by: Volker Lendecke Reviewed-by: Kai Blin --- diff --git a/source4/auth/auth.h b/source4/auth/auth.h index 503bae9d4a7..129f58d31c4 100644 --- a/source4/auth/auth.h +++ b/source4/auth/auth.h @@ -97,7 +97,6 @@ struct auth_critical_sizes { const struct auth_usersupplied_info *user_info_in, const struct auth_usersupplied_info **user_info_encrypted); -struct wbc_context; #include "auth/session.h" #include "auth/unix_token_proto.h" #include "auth/system_session_proto.h" diff --git a/source4/libcli/wbclient/wbclient.c b/source4/libcli/wbclient/wbclient.c index 3f8003bbbaf..165333a6b58 100644 --- a/source4/libcli/wbclient/wbclient.c +++ b/source4/libcli/wbclient/wbclient.c @@ -28,35 +28,6 @@ #include "libcli/util/error.h" #include "libcli/security/dom_sid.h" -/** - * Initialize the wbclient context, talloc_free() when done. - * - * \param mem_ctx talloc context to allocate memory from - * \param msg_ctx message context to use - * \param - */ -struct wbc_context *wbc_init(TALLOC_CTX *mem_ctx, - struct imessaging_context *msg_ctx, - struct tevent_context *event_ctx) -{ - struct wbc_context *ctx; - - ctx = talloc(mem_ctx, struct wbc_context); - if (ctx == NULL) return NULL; - - ctx->event_ctx = event_ctx; - - ctx->irpc_handle = irpc_binding_handle_by_name(ctx, msg_ctx, - "winbind_server", - &ndr_table_winbind); - if (ctx->irpc_handle == NULL) { - talloc_free(ctx); - return NULL; - } - - return ctx; -} - static int wb_simple_trans(struct tevent_context *ev, int fd, struct winbindd_request *wb_req, TALLOC_CTX *mem_ctx, diff --git a/source4/libcli/wbclient/wbclient.h b/source4/libcli/wbclient/wbclient.h index ba15a7c06df..fc096cc7c76 100644 --- a/source4/libcli/wbclient/wbclient.h +++ b/source4/libcli/wbclient/wbclient.h @@ -18,18 +18,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#include "lib/messaging/irpc.h" -#include "libcli/composite/composite.h" -#include "librpc/gen_ndr/ndr_winbind_c.h" - -struct wbc_context { - struct tevent_context *event_ctx; - struct dcerpc_binding_handle *irpc_handle; -}; - -struct wbc_context *wbc_init(TALLOC_CTX *mem_ctx, - struct imessaging_context *msg_ctx, - struct tevent_context *event_ctx); +#include "librpc/gen_ndr/idmap.h" NTSTATUS wbc_sids_to_xids(struct tevent_context *ev, struct id_map *ids, uint32_t count);