s3:winbindd: make use of the "winbind sealed pipes" option for all connections

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

diff --git a/source3/winbindd/winbindd.h b/source3/winbindd/winbindd.h
index 3f1c7f558e2eb9e41bd61834410c1c0fee137922..afde6857f0a5b8d98bb6b5a7c520024161e3e617 100644 (file)
--- a/source3/winbindd/winbindd.h
+++ b/source3/winbindd/winbindd.h
@@ -25,10 +25,10 @@
 
 #include "nsswitch/winbind_struct_protocol.h"
 #include "nsswitch/libwbclient/wbclient.h"
+#include "librpc/gen_ndr/dcerpc.h"
 #include "librpc/gen_ndr/wbint.h"
 
 #include "talloc_dict.h"
-#include "smb_ldap.h"
 
 #include "../lib/util/tevent_ntstatus.h"
 
@@ -106,6 +106,8 @@ struct getpwent_user {
 struct winbindd_cm_conn {
        struct cli_state *cli;
 
+       enum dcerpc_AuthLevel auth_level;
+
        struct rpc_pipe_client *samr_pipe;
        struct policy_handle sam_connect_handle, sam_domain_handle;
 
@@ -138,8 +140,8 @@ struct winbindd_child {
        struct tevent_queue *queue;
        struct dcerpc_binding_handle *binding_handle;
 
-       struct timed_event *lockout_policy_event;
-       struct timed_event *machine_password_change_event;
+       struct tevent_timer *lockout_policy_event;
+       struct tevent_timer *machine_password_change_event;
 
        const struct winbindd_child_dispatch_table *table;
 };
@@ -147,9 +149,9 @@ struct winbindd_child {
 /* Structures to hold per domain information */
 
 struct winbindd_domain {
-       fstring name;                          /* Domain name (NetBIOS) */
-       fstring alt_name;                      /* alt Domain name, if any (FQDN for ADS) */
-       fstring forest_name;                   /* Name of the AD forest we're in */
+       char *name;                            /* Domain name (NetBIOS) */
+       char *alt_name;                        /* alt Domain name, if any (FQDN for ADS) */
+       char *forest_name;                     /* Name of the AD forest we're in */
        struct dom_sid sid;                           /* SID for this domain */
        uint32 domain_flags;                   /* Domain flags from netlogon.h */
        uint32 domain_type;                    /* Domain type from netlogon.h */
@@ -194,7 +196,7 @@ struct winbindd_domain {
 
        /* A working DC */
        pid_t dc_probe_pid; /* Child we're using to detect the DC. */
-       fstring dcname;
+       char *dcname;
        struct sockaddr_storage dcaddr;
 
        /* Sequence number stuff */
@@ -214,7 +216,7 @@ struct winbindd_domain {
        /* Callback we use to try put us back online. */
 
        uint32 check_online_timeout;
-       struct timed_event *check_online_event;
+       struct tevent_timer *check_online_event;
 
        /* Linked list info */
 
@@ -387,7 +389,7 @@ struct WINBINDD_CCACHE_ENTRY {
        time_t create_time;
        time_t renew_until;
        time_t refresh_time;
-       struct timed_event *event;
+       struct tevent_timer *event;
 };
 
 #include "winbindd/winbindd_proto.h"
@@ -397,6 +399,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 */