winbind: Use standard tevent_context_init

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

diff --git a/source3/winbindd/winbindd.h b/source3/winbindd/winbindd.h
index d276b869479178827bc2166e8b9f4564389db895..c01cac7ab3a0f1e6609f9075e873b304f995dabd 100644 (file)
--- a/source3/winbindd/winbindd.h
+++ b/source3/winbindd/winbindd.h
@@ -29,6 +29,8 @@
 
 #include "talloc_dict.h"
 
+#include "../lib/util/tevent_ntstatus.h"
+
 #ifdef HAVE_LIBNSCD
 #include <libnscd.h>
 #endif
@@ -169,6 +171,7 @@ struct winbindd_domain {
                                  * we don't have to try _ex every time. */
 
        bool can_do_ncacn_ip_tcp;
+       bool can_do_validation6;
 
        /* Lookup methods for this domain (LDAP or RPC) */
        struct winbindd_methods *methods;
@@ -205,7 +208,7 @@ struct winbindd_domain {
 
        /* The child pid we're talking to */
 
-       struct winbindd_child child;
+       struct winbindd_child *children;
 
        /* Callback we use to try put us back online. */
 
@@ -217,6 +220,12 @@ struct winbindd_domain {
        struct winbindd_domain *prev, *next;
 };
 
+struct wb_acct_info {
+       fstring acct_name; /* account name */
+       fstring acct_desc; /* account name */
+       uint32_t rid; /* domain-relative RID */
+};
+
 /* per-domain methods. This is how LDAP vs RPC is selected
  */
 struct winbindd_methods {
@@ -234,13 +243,13 @@ struct winbindd_methods {
        NTSTATUS (*enum_dom_groups)(struct winbindd_domain *domain,
                                    TALLOC_CTX *mem_ctx,
                                    uint32 *num_entries, 
-                                   struct acct_info **info);
+                                   struct wb_acct_info **info);
 
        /* get a list of domain local groups */
        NTSTATUS (*enum_local_groups)(struct winbindd_domain *domain,
                                    TALLOC_CTX *mem_ctx,
                                    uint32 *num_entries, 
-                                   struct acct_info **info);
+                                   struct wb_acct_info **info);
 
        /* convert one user or group name to a sid */
        NTSTATUS (*name_to_sid)(struct winbindd_domain *domain,
@@ -387,6 +396,4 @@ struct WINBINDD_CCACHE_ENTRY {
 #define WINBINDD_PAM_AUTH_KRB5_RENEW_TIME 2592000 /* one month */
 #define DOM_SEQUENCE_NONE ((uint32)-1)
 
-#define winbind_event_context server_event_context
-
 #endif /* _WINBINDD_H */