Merge branch 'master' of ssh://git.samba.org/data/git/samba
authorJelmer Vernooij <jelmer@samba.org>
Sun, 4 Jan 2009 21:48:23 +0000 (22:48 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Sun, 4 Jan 2009 21:48:23 +0000 (22:48 +0100)
1  2 
librpc/gen_ndr/named_pipe_auth.h
source3/include/proto.h

index 87d4bfd712f855768fdc0af8eda8853093ef49be,8f2446e5646b90dc47e5fac03ba0a02cfe923669..7ca7444c92703f2d2d903611d62181d23d94ecad
@@@ -12,17 -12,18 +12,18 @@@ union named_pipe_auth_req_info 
  }/* [switch_type(uint32)] */;
  
  struct named_pipe_auth_req {
 -      uint32_t length;/* [value(ndr_size_named_pipe_auth_req(r,ndr->flags)-4),flag(LIBNDR_FLAG_BIGENDIAN)] */
 +      uint32_t length;/* [value(ndr_size_named_pipe_auth_req(r,ndr->iconv_convenience,ndr->flags)-4),flag(LIBNDR_FLAG_BIGENDIAN)] */
        const char *magic;/* [value(NAMED_PIPE_AUTH_MAGIC),charset(DOS)] */
        uint32_t level;
        union named_pipe_auth_req_info info;/* [switch_is(level)] */
  }/* [gensize,public] */;
  
  union named_pipe_auth_rep_info {
+       int _dummy_element;
  }/* [switch_type(uint32)] */;
  
  struct named_pipe_auth_rep {
 -      uint32_t length;/* [value(ndr_size_named_pipe_auth_rep(r,ndr->flags)-4),flag(LIBNDR_FLAG_BIGENDIAN)] */
 +      uint32_t length;/* [value(ndr_size_named_pipe_auth_rep(r,ndr->iconv_convenience,ndr->flags)-4),flag(LIBNDR_FLAG_BIGENDIAN)] */
        const char *magic;/* [value(NAMED_PIPE_AUTH_MAGIC),charset(DOS)] */
        uint32_t level;
        union named_pipe_auth_rep_info info;/* [switch_is(level)] */
diff --combined source3/include/proto.h
index e1e98eb125f64d59606c7c3f9dbd85c1f0653efd,6238ba3d008c3670efaefe92d21e1cf39ed9ef3e..09f12ceb86ef1cf44d0fe48f4fddfd91de227aae
@@@ -1457,10 -1457,21 +1457,21 @@@ int open_socket_in(int type
                int dlevel,
                const struct sockaddr_storage *psock,
                bool rebind);
- int open_socket_out(int type,
-               const struct sockaddr_storage *pss,
-               uint16_t port,
-               int timeout);
+ NTSTATUS open_socket_out(const struct sockaddr_storage *pss, uint16_t port,
+                        int timeout, int *pfd);
+ struct async_req *open_socket_out_send(TALLOC_CTX *mem_ctx,
+                                      struct event_context *ev,
+                                      const struct sockaddr_storage *pss,
+                                      uint16_t port,
+                                      int timeout);
+ NTSTATUS open_socket_out_recv(struct async_req *req, int *pfd);
+ struct async_req *open_socket_out_defer_send(TALLOC_CTX *mem_ctx,
+                                            struct event_context *ev,
+                                            struct timeval wait_time,
+                                            const struct sockaddr_storage *pss,
+                                            uint16_t port,
+                                            int timeout);
+ NTSTATUS open_socket_out_defer_recv(struct async_req *req, int *pfd);
  bool open_any_socket_out(struct sockaddr_storage *addrs, int num_addrs,
                         int timeout, int *fd_index, int *fd);
  int open_udp_socket(const char *host, int port);
@@@ -2307,6 -2318,19 +2318,6 @@@ _PUBLIC_ void ndr_print_bool(struct ndr
  _PUBLIC_ void ndr_print_sockaddr_storage(struct ndr_print *ndr, const char *name, const struct sockaddr_storage *ss);
  const char *ndr_errstr(enum ndr_err_code err);
  
 -/* The following definitions come from librpc/ndr/ndr_sec_helper.c  */
 -
 -size_t ndr_size_dom_sid(const struct dom_sid *sid, int flags);
 -size_t ndr_size_dom_sid28(const struct dom_sid *sid, int flags);
 -size_t ndr_size_dom_sid0(const struct dom_sid *sid, int flags);
 -size_t ndr_size_security_ace(const struct security_ace *ace, int flags);
 -size_t ndr_size_security_acl(const struct security_acl *acl, int flags);
 -size_t ndr_size_security_descriptor(const struct security_descriptor *sd, int flags);
 -void ndr_print_dom_sid(struct ndr_print *ndr, const char *name, const struct dom_sid *sid);
 -void ndr_print_dom_sid2(struct ndr_print *ndr, const char *name, const struct dom_sid *sid);
 -void ndr_print_dom_sid28(struct ndr_print *ndr, const char *name, const struct dom_sid *sid);
 -void ndr_print_dom_sid0(struct ndr_print *ndr, const char *name, const struct dom_sid *sid);
 -
  /* The following definitions come from librpc/ndr/sid.c  */
  
  char *dom_sid_string(TALLOC_CTX *mem_ctx, const struct dom_sid *sid);
@@@ -7970,4 -7994,14 +7981,14 @@@ NTSTATUS idmap_sid_to_gid(const char *d
  
  NTSTATUS nss_info_template_init( void );
  
+ /* Misc protos */
+ struct async_req *wb_trans_send(TALLOC_CTX *mem_ctx, struct event_context *ev,
+                               struct wb_context *wb_ctx, bool need_priv,
+                               const struct winbindd_request *wb_req);
+ NTSTATUS wb_trans_recv(struct async_req *req, TALLOC_CTX *mem_ctx,
+                      struct winbindd_response **presponse);
+ struct wb_context *wb_context_init(TALLOC_CTX *mem_ctx);
  #endif /*  _PROTO_H_  */