Changeset 596 for trunk/server/source3/include/proto.h

Timestamp:

Jul 2, 2011, 3:35:33 PM (14 years ago)

Author:

Herwig Bauernfeind

Message:

Samba 3.5: Update trunk to 3.5.8

File:

• trunk/server/source3/include/proto.h (modified) (10 diffs)

trunk/server/source3/include/proto.h

@@ -1239 +1239 @@
                       const struct policy_handle *hnd2);
 const char *strip_hostname(const char *s);
+bool tevent_req_poll_ntstatus(struct tevent_req *req,
+                              struct tevent_context *ev,
+                              NTSTATUS *status);
 
 /* The following definitions come from lib/util_file.c  */
@@ -1540 +1543 @@
 void strlower_m(char *s);
 void strupper_m(char *s);
+size_t strlen_m_ext(const char *s, const charset_t dst_charset);
+size_t strlen_m_ext_term(const char *s, const charset_t dst_charset);
 size_t strlen_m(const char *s);
 size_t strlen_m_term(const char *s);
@@ -3191 +3196 @@
 int matching_len_bits(unsigned char *p1, unsigned char *p2, size_t len);
 void sort_query_replies(char *data, int n, struct in_addr ip);
-char *name_mangle(TALLOC_CTX *mem_ctx, char *In, char name_type);
+char *name_mangle(TALLOC_CTX *mem_ctx, const char *In, char name_type);
 int name_extract(unsigned char *buf,size_t buf_len, unsigned int ofs, fstring name);
 int name_len(unsigned char *s1, size_t buf_len);
@@ -5256 +5261 @@
                                            const char *workstation,
                                            const uint8 chal[8],
+                                           uint16_t validation_level,
                                            DATA_BLOB lm_response,
                                            DATA_BLOB nt_response,
@@ -5267 +5273 @@
                                               const char *workstation,
                                               const uint8 chal[8],
+                                              uint16_t validation_level,
                                               DATA_BLOB lm_response,
                                               DATA_BLOB nt_response,
@@ -6464 +6471 @@
                 SMB_STRUCT_STAT *sbufp);
 NTSTATUS get_referred_path(TALLOC_CTX *ctx,
+                        struct auth_serversupplied_info *server_info,
                         const char *dfs_path,
                         struct junction_map *jucn,
@@ -6625 +6633 @@
                                  uint32 *pcreate_disposition,
                                  uint32 *pcreate_options);
-NTSTATUS open_file_fchmod(struct smb_request *req, connection_struct *conn,
+NTSTATUS open_file_fchmod(connection_struct *conn,
                           struct smb_filename *smb_fname,
                           files_struct **result);
-NTSTATUS close_file_fchmod(struct smb_request *req, files_struct *fsp);
 NTSTATUS create_directory(connection_struct *conn, struct smb_request *req,
                           struct smb_filename *smb_dname);
@@ -6657 +6664 @@
                                    struct smb_request *req,
                                    uint16_t root_dir_fid,
-                                   struct smb_filename *smb_fname);
+                                   const struct smb_filename *smb_fname,
+                                   struct smb_filename **smb_fname_out);
 
 /* The following definitions come from smbd/oplock.c  */
@@ -6765 +6773 @@
 bool set_unix_posix_acl(connection_struct *conn, files_struct *fsp, const char *fname, uint16 num_acls, const char *pdata);
 SEC_DESC *get_nt_acl_no_snum( TALLOC_CTX *ctx, const char *fname);
+NTSTATUS make_default_filesystem_acl(TALLOC_CTX *ctx,
+                                        const char *name,
+                                        SMB_STRUCT_STAT *psbuf,
+                                        SEC_DESC **ppdesc);
 
 /* The following definitions come from smbd/process.c  */
@@ -7298 +7310 @@
 int fncall_recv(struct tevent_req *req, int *perr);
 
+struct tevent_req *smbsock_connect_send(TALLOC_CTX *mem_ctx,
+                                        struct tevent_context *ev,
+                                        const struct sockaddr_storage *addr,
+                                        const char *called_name,
+                                        const char *calling_name);
+NTSTATUS smbsock_connect_recv(struct tevent_req *req, int *sock,
+                              uint16_t *port);
+NTSTATUS smbsock_connect(const struct sockaddr_storage *addr,
+                         const char *called_name, const char *calling_name,
+                         int *pfd, uint16_t *port);
+
+struct tevent_req *smbsock_any_connect_send(TALLOC_CTX *mem_ctx,
+                                            struct tevent_context *ev,
+                                            const struct sockaddr_storage *addrs,
+                                            const char **called_names,
+                                            size_t num_addrs);
+NTSTATUS smbsock_any_connect_recv(struct tevent_req *req, int *pfd,
+                                  size_t *chosen_index, uint16_t *port);
+NTSTATUS smbsock_any_connect(const struct sockaddr_storage *addrs,
+                             const char **called_names, size_t num_addrs,
+                             int *pfd, size_t *chosen_index, uint16_t *port);
+
 /* The following definitions come from rpc_server/srv_samr_nt.c */
 NTSTATUS access_check_object( SEC_DESC *psd, NT_USER_TOKEN *token,