Changeset 232 for branches/samba-3.2.x/source/include/proto.h

Timestamp:

May 27, 2009, 9:09:42 AM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update 3.2 branch to 3.2.8

File:

• branches/samba-3.2.x/source/include/proto.h (modified) (9 diffs)

branches/samba-3.2.x/source/include/proto.h

@@ -448 +448 @@
 bool dbwrap_fetch_uint32(struct db_context *db, const char *keystr,
                          uint32_t *val);
-bool dbwrap_store_uint32(struct db_context *db, const char *keystr, uint32_t v);
+int dbwrap_store_uint32(struct db_context *db, const char *keystr, uint32_t v);
 uint32_t dbwrap_change_uint32_atomic(struct db_context *db, const char *keystr,
                                      uint32_t *oldval, uint32_t change_val);
@@ -543 +543 @@
                                          struct timeval *to_ret);
 int event_loop_once(struct event_context *ev);
+void event_context_reinit(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);
 
@@ -990 +987 @@
 ssize_t sys_read(int fd, void *buf, size_t count);
 ssize_t sys_write(int fd, const void *buf, size_t count);
+ssize_t sys_writev(int fd, const struct iovec *iov, int iovcnt);
 ssize_t sys_pread(int fd, void *buf, size_t count, SMB_OFF_T off);
 ssize_t sys_pwrite(int fd, const void *buf, size_t count, SMB_OFF_T off);
@@ -1247 +1245 @@
 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);
@@ -1518 +1517 @@
                                   size_t *size_ret);
 NTSTATUS read_data(int fd, char *buffer, size_t N);
+ssize_t write_data_iov(int fd, const struct iovec *orig_iov, int iovcnt);
 ssize_t write_data(int fd, const char *buffer, size_t N);
 bool send_keepalive(int client);
@@ -4645 +4645 @@
 
 bool saf_store( const char *domain, const char *servername );
+bool saf_join_store( const char *domain, const char *servername );
 bool saf_delete( const char *domain );
 char *saf_fetch( const char *domain );
@@ -5111 +5112 @@
 bool is_unused_share_mode_entry(const struct share_mode_entry *e);
 void set_share_mode(struct share_mode_lock *lck, files_struct *fsp,
-                        uid_t uid, uint16 mid, uint16 op_type, bool initial_delete_on_close_allowed);
+                    uid_t uid, uint16 mid, uint16 op_type);
 void add_deferred_open(struct share_mode_lock *lck, uint16 mid,
                        struct timeval request_time,
@@ -5121 +5122 @@
 NTSTATUS can_set_delete_on_close(files_struct *fsp, bool delete_on_close,
                                  uint32 dosmode);
-bool can_set_initial_delete_on_close(const struct share_mode_lock *lck);
 void set_delete_on_close_token(struct share_mode_lock *lck, UNIX_USER_TOKEN *tok);
 void set_delete_on_close_lck(struct share_mode_lock *lck, bool delete_on_close, UNIX_USER_TOKEN *tok);
 bool set_delete_on_close(files_struct *fsp, bool delete_on_close, UNIX_USER_TOKEN *tok);
-bool set_allow_initial_delete_on_close(struct share_mode_lock *lck, files_struct *fsp, bool delete_on_close);
 bool set_sticky_write_time(struct file_id fileid, struct timespec write_time);
 bool set_write_time(struct file_id fileid, struct timespec write_time);
@@ -6568 +6567 @@
 
 NTSTATUS print_fsp_open(connection_struct *conn, const char *fname,
-                        files_struct *fsp);
+                        files_struct *fsp, SMB_STRUCT_STAT *psbuf);
 void print_fsp_end(files_struct *fsp, enum file_close_type close_type);