s4:lib/tevent: rename structs

[bbaumbach/samba-autobuild/.git] / source4 / winbind / wb_server.h

diff --git a/source4/winbind/wb_server.h b/source4/winbind/wb_server.h
index 2a2aec20ea807608df9840239a55aa3518227c50..be79872e6582b477662d89d1b139998c204b86b3 100644 (file)
--- a/source4/winbind/wb_server.h
+++ b/source4/winbind/wb_server.h
@@ -7,7 +7,7 @@
    
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
    
    This program is distributed in the hope that it will be useful,
@@ -16,13 +16,13 @@
    GNU General Public License for more details.
    
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "nsswitch/winbindd_nss.h"
-
-
+#include "nsswitch/winbind_nss_config.h"
+#include "nsswitch/winbind_struct_protocol.h"
+#include "winbind/idmap.h"
+#include "libnet/libnet.h"
 
 #define WINBINDD_SAMBA3_SOCKET "pipe"
 /* the privileged socket is in smbd_tmp_dir() */
@@ -34,6 +34,9 @@ struct wbsrv_service {
 
        const struct dom_sid *primary_sid;
        struct wbsrv_domain *domains;
+       struct idmap_context *idmap_ctx;
+
+       const char *priv_socket_path;
 };
 
 struct wbsrv_samconn {
@@ -49,9 +52,8 @@ struct wb_dom_info {
        const char *dns_name;
        const struct dom_sid *sid;
 
-       const char *dc_name;
-       const char *dc_dns_name;
-       const char *dc_address;
+       int num_dcs;
+       struct nbt_dc_name *dcs;
 };
 
 struct wbsrv_domain {
@@ -59,18 +61,18 @@ struct wbsrv_domain {
 
        struct wb_dom_info *info;
 
-       struct dcerpc_pipe *lsa_pipe;
-       struct policy_handle *lsa_policy;
-       uint8_t lsa_auth_type;
+       /* Details for the server we are currently talking to */
+       const char *dc_address;
+       const char *dc_name;
+
+       struct libnet_context *libnet_ctx;
 
-       struct dcerpc_pipe *samr_pipe;
-       struct policy_handle *samr_handle;
-       struct policy_handle *domain_handle;
+       struct dcerpc_binding *lsa_binding;
 
-       struct ldap_connection *ldap_conn;
+       struct dcerpc_binding *samr_binding;
 
        struct dcerpc_pipe *netlogon_pipe;
-       struct cli_credentials *schannel_creds;
+       struct dcerpc_binding *netlogon_binding;
 };
 
 /*
@@ -79,7 +81,7 @@ struct wbsrv_domain {
 struct wbsrv_listen_socket {
        const char *socket_path;
        struct wbsrv_service *service;
-       BOOL privileged;
+       bool privileged;
 };
 
 /*
@@ -99,12 +101,28 @@ struct wbsrv_connection {
        uint32_t pending_calls;
 
        struct packet_context *packet;
+
+       struct loadparm_context *lp_ctx;
 };
 
 #define WBSRV_SAMBA3_SET_STRING(dest, src) do { \
-       strncpy(dest, src, sizeof(dest)-1);\
+       safe_strcpy(dest, src, sizeof(dest)-1);\
 } while(0)
 
+/*
+  state of a pwent query
+*/
+struct wbsrv_pwent {
+       /* 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 one request
 
@@ -131,7 +149,7 @@ struct wbsrv_samba3_call {
        struct wbsrv_connection *wbconn;
 
        /* the backend should use this event context */
-       struct event_context *event_ctx;
+       struct tevent_context *event_ctx;
 
        /* here the backend can store stuff like composite_context's ... */
        void *private_data;
@@ -145,6 +163,7 @@ struct wbsrv_samba3_call {
 
 struct netr_LMSessionKey;
 struct netr_UserSessionKey;
+struct winbind_SamLogon;
 
 #include "winbind/wb_async_helpers.h"
 #include "winbind/wb_proto.h"