Changeset 745 for trunk/server/source4/winbind/wb_server.h

Timestamp:

Nov 27, 2012, 4:43:17 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.0

Location:

trunk/server

Files:

• . (modified) (1 prop)
• source4/winbind/wb_server.h (modified) (8 diffs)

trunk/server/source4/winbind/wb_server.h

@@ -25 +25 @@
 #include "libnet/libnet.h"
 
-#define WINBINDD_SAMBA3_SOCKET "pipe"
-/* the privileged socket is in smbd_tmp_dir() */
-#define WINBINDD_SAMBA3_PRIVILEGED_SOCKET "winbind_pipe"
-
 /* this struct stores global data for the winbind task */
 struct wbsrv_service {
@@ -34 +30 @@
 
         const struct dom_sid *primary_sid;
+        enum netr_SchannelType sec_channel_type;
         struct wbsrv_domain *domains;
         struct idmap_context *idmap_ctx;
-
-        const char *priv_socket_path;
+        const char *priv_pipe_dir;
+        const char *pipe_dir;
 };
 
@@ -52 +49 @@
         const char *dns_name;
         const struct dom_sid *sid;
-
-        int num_dcs;
-        struct nbt_dc_name *dcs;
+        struct nbt_dc_name *dc;
 };
 
@@ -101 +96 @@
         uint32_t pending_calls;
 
-        struct packet_context *packet;
+        struct tstream_context *tstream;
+
+        struct tevent_queue *send_queue;
 
         struct loadparm_context *lp_ctx;
@@ -107 +104 @@
 
 #define WBSRV_SAMBA3_SET_STRING(dest, src) do { \
+        memset(dest, 0, sizeof(dest));\
         safe_strcpy(dest, src, sizeof(dest)-1);\
 } while(0)
@@ -116 +114 @@
         /* Current UserList structure, contains 1+ user structs */
         struct libnet_UserList *user_list;
+
+        /* Index of the next user struct in the current UserList struct */
+        uint32_t page_index;
+
+        /* The libnet_ctx to use for the libnet_UserList call */
+        struct libnet_context *libnet_ctx;
+};
+/*
+  state of a grent query
+*/
+struct wbsrv_grent {
+        /* Current UserList structure, contains 1+ user structs */
+        struct libnet_GroupList *group_list;
 
         /* Index of the next user struct in the current UserList struct */
@@ -149 +160 @@
         struct wbsrv_connection *wbconn;
 
-        /* the backend should use this event context */
-        struct tevent_context *event_ctx;
-
         /* here the backend can store stuff like composite_context's ... */
         void *private_data;
 
         /* the request structure of the samba3 protocol */
-        struct winbindd_request request;
+        struct winbindd_request *request;
         
         /* the response structure of the samba3 protocol*/
-        struct winbindd_response response;
+        struct winbindd_response *response;
+
+        DATA_BLOB in;
+        DATA_BLOB out;
+        struct iovec out_iov[1];
 };
 
@@ -165 +177 @@
 struct netr_UserSessionKey;
 struct winbind_SamLogon;
+struct winbind_DsrUpdateReadOnlyServerDnsRecords;
 
 #include "winbind/wb_async_helpers.h"