Ignore:
Timestamp:
Apr 9, 2010, 3:20:58 PM (15 years ago)
Author:
Silvan Scherrer
Message:

Samba 3.5.x: update to 3.5.2

Location:
vendor/current/source3/include
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • vendor/current/source3/include/client.h

    r414 r427  
    111111        NTSTATUS (*trans_recv)(struct tevent_req *req, TALLOC_CTX *mem_ctx,
    112112                               uint8_t **prdata, uint32_t *prdata_len);
     113
     114        bool (*is_connected)(void *priv);
     115        unsigned int (*set_timeout)(void *priv, unsigned int timeout);
     116
    113117        void *priv;
    114118};

  • vendor/current/source3/include/config.h.in

    r414 r427  
    359359#undef HAVE_CRYPT_H
    360360
    361 /* Whether CTDB_CONTROL_TRANS2_ACTIVE() is available */
    362 #undef HAVE_CTDB_CONTROL_TRANS2_ACTIVE_DECL
    363 
    364 /* Whether CTDB_CONTROL_TRANS2_COMMIT_RETRY() is available */
    365 #undef HAVE_CTDB_CONTROL_TRANS2_COMMIT_RETRY_DECL
     361/* Whether CTDB_CONTROL_TRANS3_COMMIT() is available */
     362#undef HAVE_CTDB_CONTROL_TRANS3_COMMIT_DECL
    366363
    367364/* Define to 1 if you have the <ctdb.h> header file. */
    … …  
    17301727/* Define to 1 if you have the `printf' function. */
    17311728#undef HAVE_PRINTF
     1729
     1730/* Do we have pthreads around? */
     1731#undef HAVE_PTHREAD
    17321732
    17331733/* Define to 1 if you have the <pthread.h> header file. */

  • vendor/current/source3/include/ctdbd_conn.h

    r414 r427  
    3232NTSTATUS ctdbd_register_msg_ctx(struct ctdbd_connection *conn,
    3333                                struct messaging_context *msg_ctx);
     34struct messaging_context *ctdb_conn_msg_ctx(struct ctdbd_connection *conn);
     35
     36int ctdbd_conn_get_fd(struct ctdbd_connection *conn);
    3437
    3538NTSTATUS ctdbd_messaging_send(struct ctdbd_connection *conn,
    … …  
    7477                             TALLOC_CTX *mem_ctx, TDB_DATA *outdata,
    7578                             int *cstatus);
     79NTSTATUS ctdb_watch_us(struct ctdbd_connection *conn);
     80NTSTATUS ctdb_unwatch(struct ctdbd_connection *conn);
    7681
    7782#endif /* _CTDBD_CONN_H */

  • vendor/current/source3/include/proto.h

    r414 r427  
    23352335void cli_set_nt_error(struct cli_state *cli, NTSTATUS status);
    23362336void cli_reset_error(struct cli_state *cli);
     2337bool cli_state_is_connected(struct cli_state *cli);
    23372338
    23382339/* The following definitions come from libsmb/clifile.c  */
    … …  
    52925293unsigned int rpccli_set_timeout(struct rpc_pipe_client *cli,
    52935294                                unsigned int timeout);
     5295bool rpccli_is_connected(struct rpc_pipe_client *rpc_cli);
    52945296bool rpccli_get_pwd_hash(struct rpc_pipe_client *cli, uint8_t nt_hash[16]);
    52955297NTSTATUS rpccli_anon_bind_data(TALLOC_CTX *mem_ctx,
    … …  
    53855387                               struct rpc_cli_transport **presult);
    53865388struct cli_state *rpc_pipe_np_smb_conn(struct rpc_pipe_client *p);
    5387 void rpccli_close_np_fd(struct rpc_pipe_client *p);
    53885389
    53895390/* The following definitions come from rpc_client/rpc_transport_smbd.c  */
    … …  
    54225423NTSTATUS rpc_transport_sock_init(TALLOC_CTX *mem_ctx, int fd,
    54235424                                 struct rpc_cli_transport **presult);
    5424 int rpccli_set_sock_timeout(struct rpc_pipe_client *rpccli, int timeout);
    5425 void rpccli_close_sock_fd(struct rpc_pipe_client *rpccli);
    5426 bool rpc_pipe_tcp_connection_ok(struct rpc_pipe_client *rpccli);
    54275425
    54285426/* The following definitions come from rpc_client/cli_samr.c  */
    … …  
    55685566                                     uint32_t offered,
    55695567                                     enum winreg_Type *type,
    5570                                      union spoolss_PrinterData *data);
     5568                                     uint32_t *needed_p,
     5569                                     uint8_t **data_p);
    55715570WERROR rpccli_spoolss_enumprinterkey(struct rpc_pipe_client *cli,
    55725571                                     TALLOC_CTX *mem_ctx,

  • vendor/current/source3/include/smb.h

    r414 r427  
    17241724    KERNEL_OPLOCK_CAPABILITY,
    17251725    DMAPI_ACCESS_CAPABILITY,
    1726     LEASE_CAPABILITY,
    1727     KILL_CAPABILITY
     1726    LEASE_CAPABILITY
    17281727};
    17291728

  • vendor/current/source3/include/version.h

    r414 r427  
    22#define SAMBA_VERSION_MAJOR 3
    33#define SAMBA_VERSION_MINOR 5
    4 #define SAMBA_VERSION_RELEASE 0
    5 #define SAMBA_VERSION_OFFICIAL_STRING "3.5.0"
     4#define SAMBA_VERSION_RELEASE 2
     5#define SAMBA_VERSION_OFFICIAL_STRING "3.5.2"
    66#ifdef SAMBA_VERSION_VENDOR_FUNCTION
    77#  define SAMBA_VERSION_STRING SAMBA_VERSION_VENDOR_FUNCTION
Note: See TracChangeset for help on using the changeset viewer.