Merge branch 'master' of ssh://git.samba.org/data/git/samba
authorJelmer Vernooij <jelmer@samba.org>
Mon, 5 Jan 2009 17:01:04 +0000 (18:01 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Mon, 5 Jan 2009 17:01:04 +0000 (18:01 +0100)
1  2 
source3/include/includes.h
source3/include/proto.h

index 64be27336d0e2f9d12d03fef6eddca817f1376a1,cae627f56427b2f6b60aa216232c9da60fda989f..8b0ff71c4ec4a0ac236cfe8e36bb379c4d49f3d2
@@@ -559,6 -559,7 +559,6 @@@ typedef char fstring[FSTRING_LEN]
  #endif
  
  /* Samba 3 doesn't use iconv_convenience: */
 -extern void *global_iconv_convenience;
  extern void *cmdline_lp_ctx;
  struct smb_iconv_convenience *lp_iconv_convenience(void *lp_ctx);
  
  
  #include "../talloc/talloc.h"
  
+ #include "event.h"
  #include "../lib/util/data_blob.h"
  #include "../lib/util/time.h"
  #include "../lib/util/asn1.h"
  #include "nsswitch/winbind_client.h"
  #include "spnego.h"
  #include "rpc_client.h"
- #include "event.h"
  #include "dbwrap.h"
  #include "packet.h"
  #include "ctdbd_conn.h"
diff --combined source3/include/proto.h
index 09f12ceb86ef1cf44d0fe48f4fddfd91de227aae,cfac164789003a824497b326761395a829b01b57..22183118e26cda8240d5ff4f6b955383afe7c1cc
@@@ -501,46 -501,6 +501,6 @@@ void display_set_stderr(void)
  NTSTATUS map_nt_error_from_unix(int unix_error);
  int map_errno_from_nt_status(NTSTATUS status);
  
- /* The following definitions come from lib/events.c  */
- struct timed_event *event_add_timed(struct event_context *event_ctx,
-                               TALLOC_CTX *mem_ctx,
-                               struct timeval when,
-                               const char *event_name,
-                               void (*handler)(struct event_context *event_ctx,
-                                               struct timed_event *te,
-                                               const struct timeval *now,
-                                               void *private_data),
-                               void *private_data);
- struct fd_event *event_add_fd(struct event_context *event_ctx,
-                             TALLOC_CTX *mem_ctx,
-                             int fd, uint16_t flags,
-                             void (*handler)(struct event_context *event_ctx,
-                                             struct fd_event *event,
-                                             uint16 flags,
-                                             void *private_data),
-                             void *private_data);
- void event_fd_set_writeable(struct fd_event *fde);
- void event_fd_set_not_writeable(struct fd_event *fde);
- void event_fd_set_readable(struct fd_event *fde);
- void event_fd_set_not_readable(struct fd_event *fde);
- bool event_add_to_select_args(struct event_context *event_ctx,
-                             const struct timeval *now,
-                             fd_set *read_fds, fd_set *write_fds,
-                             struct timeval *timeout, int *maxfd);
- bool events_pending(struct event_context *event_ctx);
- bool run_events(struct event_context *event_ctx,
-               int selrtn, fd_set *read_fds, fd_set *write_fds);
- struct timeval *get_timed_events_timeout(struct event_context *event_ctx,
-                                        struct timeval *to_ret);
- int event_loop_once(struct event_context *ev);
- struct event_context *event_context_init(TALLOC_CTX *mem_ctx);
- int set_event_dispatch_time(struct event_context *event_ctx,
-                           const char *event_name, struct timeval when);
- int cancel_named_event(struct event_context *event_ctx,
-                      const char *event_name);
- void dump_event_list(struct event_context *event_ctx);
  /* The following definitions come from lib/fault.c  */
  void fault_setup(void (*fn)(void *));
  void dump_core_setup(const char *progname);
@@@ -1183,6 -1143,7 +1143,7 @@@ int set_blocking(int fd, bool set)
  void smb_msleep(unsigned int t);
  void become_daemon(bool Fork, bool no_process_group);
  bool reinit_after_fork(struct messaging_context *msg_ctx,
+                      struct event_context *ev_ctx,
                       bool parent_longlived);
  bool yesno(const char *p);
  void *malloc_(size_t size);
@@@ -2318,6 -2279,19 +2279,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);