s3compat-only s3:winbindd Split event handlers from winbindd.c

[abartlet/samba.git/.git] / source3 / winbindd / winbindd_proto.h

diff --git a/source3/winbindd/winbindd_proto.h b/source3/winbindd/winbindd_proto.h
index 02b5c666129d76e58aa45e2dbeca32006ef7cb1a..18c2d85a62be36e547acb6ff1ffc956642e90a80 100644 (file)
--- a/source3/winbindd/winbindd_proto.h
+++ b/source3/winbindd/winbindd_proto.h
@@ -26,32 +26,43 @@
 
 /* The following definitions come from auth/token_util.c  */
 
-bool nt_token_check_sid ( const struct dom_sid *sid, const NT_USER_TOKEN *token );
-bool nt_token_check_domain_rid( NT_USER_TOKEN *token, uint32 rid );
-NT_USER_TOKEN *get_root_nt_token( void );
+bool nt_token_check_sid ( const struct dom_sid *sid, const struct security_token *token );
+bool nt_token_check_domain_rid( struct security_token *token, uint32 rid );
+struct security_token *get_root_nt_token( void );
 NTSTATUS add_aliases(const struct dom_sid *domain_sid,
-                    struct nt_user_token *token);
-struct nt_user_token *create_local_nt_token(TALLOC_CTX *mem_ctx,
+                    struct security_token *token);
+struct security_token *create_local_nt_token(TALLOC_CTX *mem_ctx,
                                            const struct dom_sid *user_sid,
                                            bool is_guest,
                                            int num_groupsids,
                                            const struct dom_sid *groupsids);
-void debug_nt_user_token(int dbg_class, int dbg_lev, NT_USER_TOKEN *token);
+void debug_nt_user_token(int dbg_class, int dbg_lev, struct security_token *token);
 void debug_unix_user_token(int dbg_class, int dbg_lev, uid_t uid, gid_t gid,
                           int n_groups, gid_t *groups);
 
-/* The following definitions come from winbindd/winbindd.c  */
+/* The following definitions come from winbindd/winbindd_event.c  */
+const char *get_winbind_pipe_dir(void);
+char *get_winbind_priv_pipe_dir(void);
+bool winbindd_setup_listeners(void);
+void request_finished(struct winbindd_cli_state *state);
+void winbindd_remove_client(struct winbindd_cli_state *state);
+bool client_is_idle(struct winbindd_cli_state *state);
+
+/* The following definitions come from winbindd/winbindd_event_handlers.c  */
 struct messaging_context *winbind_messaging_context(void);
+bool winbindd_reload_services_file(const char *lfile);
+void winbindd_register_handlers(void);
+
+/* The following definitions come from winbindd/winbindd_process.c  */
+void wb_process_request(struct winbindd_cli_state *state);
 void request_error(struct winbindd_cli_state *state);
 void request_ok(struct winbindd_cli_state *state);
+
+/* The following definitions come from winbindd/winbindd.c  */
 bool winbindd_setup_sig_term_handler(bool parent);
 bool winbindd_setup_sig_hup_handler(const char *lfile);
 bool winbindd_use_idmap_cache(void);
 bool winbindd_use_cache(void);
-void winbindd_register_handlers(void);
-const char *get_winbind_pipe_dir(void);
-char *get_winbind_priv_pipe_dir(void);
-int main(int argc, char **argv, char **envp);
 
 /* The following definitions come from winbindd/winbindd_ads.c  */
 
@@ -81,7 +92,6 @@ bool parse_sidlist(TALLOC_CTX *mem_ctx, const char *sidstr,
 
 /* The following definitions come from winbindd/winbindd_cache.c  */
 
-void winbindd_check_cache_size(time_t t);
 struct cache_entry *centry_start(struct winbindd_domain *domain, NTSTATUS status);
 NTSTATUS wcache_cached_creds_exist(struct winbindd_domain *domain, const struct dom_sid *sid);
 NTSTATUS wcache_get_creds(struct winbindd_domain *domain, 
@@ -403,7 +413,7 @@ char *fill_domain_username_talloc(TALLOC_CTX *ctx,
                                  bool can_assume);
 struct winbindd_cli_state *winbindd_client_list(void);
 void winbindd_add_client(struct winbindd_cli_state *cli);
-void winbindd_remove_client(struct winbindd_cli_state *cli);
+void winbindd_remove_client_from_list(struct winbindd_cli_state *cli);
 int winbindd_num_clients(void);
 NTSTATUS lookup_usergroups_cached(struct winbindd_domain *domain,
                                  TALLOC_CTX *mem_ctx,