From 939c3cb5d78e3a2236209b296aa8aba8bdce32d3 Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Fri, 30 Sep 2005 17:13:37 +0000 Subject: r10656: BIG merge from trunk. Features not copied over * \PIPE\unixinfo * winbindd's {group,alias}membership new functions * winbindd's lookupsids() functionality * swat (trunk changes to be reverted as per discussion with Deryck) --- source/nsswitch/winbindd.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'source/nsswitch/winbindd.h') diff --git a/source/nsswitch/winbindd.h b/source/nsswitch/winbindd.h index 3a7728e4a2c..0db109dacde 100644 --- a/source/nsswitch/winbindd.h +++ b/source/nsswitch/winbindd.h @@ -47,6 +47,14 @@ struct fd_event { void *private_data; }; +struct sid_ctr { + DOM_SID *sid; + BOOL finished; + const char *domain; + const char *name; + enum SID_NAME_USE type; +}; + struct winbindd_cli_state { struct winbindd_cli_state *prev, *next; /* Linked list pointers */ int sock; /* Open socket from client */ @@ -122,12 +130,6 @@ struct winbindd_cm_conn { struct rpc_pipe_client *lsa_pipe; POLICY_HND lsa_policy; - /* Auth2 pipe is the pipe used to setup the netlogon schannel key - * using rpccli_net_auth2. It needs to be kept open. */ - - struct rpc_pipe_client *netlogon_auth2_pipe; - unsigned char sess_key[16]; /* Current session key. */ - DOM_CRED clnt_cred; /* Client NETLOGON credential. */ struct rpc_pipe_client *netlogon_pipe; }; @@ -305,8 +307,6 @@ struct winbindd_idmap_methods { #include "nsswitch/winbindd_proto.h" -#include "rpc_parse.h" - #define WINBINDD_ESTABLISH_LOOP 30 #define WINBINDD_RESCAN_FREQ 300 -- cgit