Ignore:
Timestamp:
May 26, 2009, 9:44:50 AM (16 years ago)
Author:
Herwig Bauernfeind
Message:

Update 3.2 branch to 3.2.6

Location:
branches/samba-3.2.x/source/include
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • branches/samba-3.2.x/source/include/config.h.in

    r204 r228  
    308308#undef HAVE_CUPS
    309309
     310/* Define to 1 if you have the <cups/cups.h> header file. */
     311#undef HAVE_CUPS_CUPS_H
     312
     313/* Define to 1 if you have the <cups/language.h> header file. */
     314#undef HAVE_CUPS_LANGUAGE_H
     315
    310316/* Whether to use the Darwin-specific initgroups system call */
    311317#undef HAVE_DARWIN_INITGROUPS
    … …  
    19261932#undef HAVE_SYS_ID_H
    19271933
     1934/* Define to 1 if you have the <sys/inotify.h> header file. */
     1935#undef HAVE_SYS_INOTIFY_H
     1936
    19281937/* Define to 1 if you have the <sys/ioctl.h> header file. */
    19291938#undef HAVE_SYS_IOCTL_H
    … …  
    26502659/* Whether sysconf(_SC_PAGESIZE) is available */
    26512660#undef SYSCONF_SC_PAGESIZE
     2661
     2662/* syslog facility to log to */
     2663#undef SYSLOG_FACILITY
    26522664
    26532665/* Whether this is a system V system */
    … …  
    31233135#undef vfs_shadow_copy_init
    31243136
     3137/* Whether to build vfs_smb_traffic_analyzer as shared module */
     3138#undef vfs_smb_traffic_analyzer_init
     3139
    31253140/* Whether to build vfs_solarisacl as shared module */
    31263141#undef vfs_solarisacl_init

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

    r204 r228  
    731731/* The following definitions come from lib/readline.c  */
    732732
     733void smb_readline_done(void);
    733734char *smb_readline(const char *prompt, void (*callback)(void),
    734735                   char **(completion_fn)(const char *text, int start, int end));
    … …  
    14581459                                    uint32 rid, uint32 **pp_rids, size_t *p_num);
    14591460bool is_null_sid(const DOM_SID *sid);
     1461bool is_sid_in_token(const NT_USER_TOKEN *token, const DOM_SID *sid);
    14601462NTSTATUS sid_array_from_info3(TALLOC_CTX *mem_ctx,
    14611463                              const struct netr_SamInfo3 *info3,
    … …  
    14801482bool is_zero_addr(const struct sockaddr_storage *pss);
    14811483void zero_ip_v4(struct in_addr *ip);
    1482 void zero_addr(struct sockaddr_storage *pss);
     1484void zero_sockaddr(struct sockaddr_storage *pss);
    14831485bool same_net_v4(struct in_addr ip1,struct in_addr ip2,struct in_addr mask);
    14841486void in_addr_to_sockaddr_storage(struct sockaddr_storage *ss,
    … …  
    14871489                const struct sockaddr_storage *ip2,
    14881490                const struct sockaddr_storage *mask);
    1489 bool addr_equal(const struct sockaddr_storage *ip1,
    1490                 const struct sockaddr_storage *ip2);
     1491bool sockaddr_equal(const struct sockaddr_storage *ip1,
     1492                    const struct sockaddr_storage *ip2);
    14911493bool is_address_any(const struct sockaddr_storage *psa);
    14921494uint16_t get_sockaddr_port(const struct sockaddr_storage *pss);
    … …  
    20372039                                char ***ous,
    20382040                                size_t *num_ous);
    2039 bool ads_get_sid_from_extended_dn(TALLOC_CTX *mem_ctx,
    2040                                   const char *extended_dn,
    2041                                   enum ads_extended_dn_flags flags,
    2042                                   DOM_SID *sid);
     2041ADS_STATUS ads_get_sid_from_extended_dn(TALLOC_CTX *mem_ctx,
     2042                                        const char *extended_dn,
     2043                                        enum ads_extended_dn_flags flags,
     2044                                        DOM_SID *sid);
    20432045char* ads_get_dnshostname( ADS_STRUCT *ads, TALLOC_CTX *ctx, const char *machine_name );
    20442046char* ads_get_upn( ADS_STRUCT *ads, TALLOC_CTX *ctx, const char *machine_name );
    … …  
    32373239/* The following definitions come from librpc/gen_ndr/ndr_security.c  */
    32383240
     3241_PUBLIC_ enum ndr_err_code ndr_push_security_ace_flags(struct ndr_push *ndr, int ndr_flags, uint8_t r);
     3242_PUBLIC_ enum ndr_err_code ndr_pull_security_ace_flags(struct ndr_pull *ndr, int ndr_flags, uint8_t *r);
    32393243_PUBLIC_ void ndr_print_security_ace_flags(struct ndr_print *ndr, const char *name, uint8_t r);
     3244_PUBLIC_ enum ndr_err_code ndr_push_security_ace_type(struct ndr_push *ndr, int ndr_flags, enum security_ace_type r);
     3245_PUBLIC_ enum ndr_err_code ndr_pull_security_ace_type(struct ndr_pull *ndr, int ndr_flags, enum security_ace_type *r);
    32403246_PUBLIC_ void ndr_print_security_ace_type(struct ndr_print *ndr, const char *name, enum security_ace_type r);
    32413247_PUBLIC_ void ndr_print_security_ace_object_flags(struct ndr_print *ndr, const char *name, uint32_t r);
    … …  
    32433249_PUBLIC_ void ndr_print_security_ace_object_inherited_type(struct ndr_print *ndr, const char *name, const union security_ace_object_inherited_type *r);
    32443250_PUBLIC_ void ndr_print_security_ace_object(struct ndr_print *ndr, const char *name, const struct security_ace_object *r);
     3251_PUBLIC_ enum ndr_err_code ndr_push_security_ace_object_ctr(struct ndr_push *ndr, int ndr_flags, const union security_ace_object_ctr *r);
     3252_PUBLIC_ enum ndr_err_code ndr_pull_security_ace_object_ctr(struct ndr_pull *ndr, int ndr_flags, union security_ace_object_ctr *r);
    32453253_PUBLIC_ void ndr_print_security_ace_object_ctr(struct ndr_print *ndr, const char *name, const union security_ace_object_ctr *r);
    32463254_PUBLIC_ enum ndr_err_code ndr_push_security_ace(struct ndr_push *ndr, int ndr_flags, const struct security_ace *r);
    3247 _PUBLIC_ enum ndr_err_code ndr_pull_security_ace(struct ndr_pull *ndr, int ndr_flags, struct security_ace *r);
    32483255_PUBLIC_ void ndr_print_security_ace(struct ndr_print *ndr, const char *name, const struct security_ace *r);
    32493256_PUBLIC_ void ndr_print_security_acl_revision(struct ndr_print *ndr, const char *name, enum security_acl_revision r);
    … …  
    39383945size_t ndr_size_dom_sid28(const struct dom_sid *sid, int flags);
    39393946size_t ndr_size_dom_sid0(const struct dom_sid *sid, int flags);
     3947enum ndr_err_code ndr_pull_security_ace(struct ndr_pull *ndr, int ndr_flags, struct security_ace *r);
    39403948size_t ndr_size_security_ace(const struct security_ace *ace, int flags);
    39413949size_t ndr_size_security_acl(const struct security_acl *acl, int flags);
    … …  
    52275235NTSTATUS vfs_shadow_copy2_init(void);
    52285236
     5237/* The following definitions come from modules/vfs_smb_traffic_analyzer.c  */
     5238
     5239NTSTATUS vfs_smb_traffic_analyzer_init(void);
     5240
     5241/* The following definitions come from modules/vfs_streams_depot.c  */
     5242
     5243NTSTATUS vfs_streams_depot_init(void);
     5244
    52295245/* The following definitions come from modules/vfs_streams_xattr.c  */
    52305246
    … …  
    56375653const char **lp_wins_server_list(void);
    56385654const char **lp_interfaces(void);
    5639 char *lp_socket_address(void);
    56405655char *lp_nis_home_map_name(void);
    56415656const char **lp_netbios_aliases(void);
    … …  
    59715986struct parm_struct *lp_next_parameter(int snum, int *i, int allparameters);
    59725987bool lp_snum_ok(int iService);
    5973 void lp_add_one_printer(char *name, char *comment);
     5988void lp_add_one_printer(const char *name, const char *comment, void *pdata);
    59745989bool lp_loaded(void);
    59755990void lp_killunused(bool (*snumused) (int));
    … …  
    60476062void lp_set_posix_default_cifsx_readwrite_locktype(enum brl_flavour val);
    60486063int lp_min_receive_file_size(void);
     6064const char *lp_socket_address(void);
    60496065
    60506066/* The following definitions come from param/params.c  */
    … …  
    65176533/* The following definitions come from printing/pcap.c  */
    65186534
     6535bool pcap_cache_add_specific(struct pcap_cache **ppcache, const char *name, const char *comment);
     6536void pcap_cache_destroy_specific(struct pcap_cache **pp_cache);
    65196537bool pcap_cache_add(const char *name, const char *comment);
    65206538bool pcap_cache_loaded(void);
     6539void pcap_cache_replace(const struct pcap_cache *pcache);
    65216540void pcap_cache_reload(void);
    65226541bool pcap_printername_ok(const char *printername);
    6523 void pcap_printer_fn(void (*fn)(char *, char *));
     6542void pcap_printer_fn_specific(const struct pcap_cache *pc,
     6543                        void (*fn)(const char *, const char *, void *),
     6544                        void *pdata);
     6545void pcap_printer_fn(void (*fn)(const char *, const char *, void *), void *pdata);
    65246546
    65256547/* The following definitions come from printing/print_aix.c  */
    … …  
    65466568
    65476569NTSTATUS print_fsp_open(connection_struct *conn, const char *fname,
    6548                         files_struct **result);
     6570                        files_struct *fsp);
    65496571void print_fsp_end(files_struct *fsp, enum file_close_type close_type);
    65506572
    … …  
    73327354                           uint8_t lm_password_set,
    73337355                           uint8_t password_expired,
    7334                            uint8_t data[516],
    7335                            uint8_t pw_len);
     7356                           struct samr_CryptPassword *pwd_buf);
    73367357void init_samr_user_info24(struct samr_UserInfo24 *r,
    7337                            uint8_t data[516],
    7338                            uint8_t pw_len);
     7358                           struct samr_CryptPassword *pwd_buf,
     7359                           uint8_t password_expired);
     7360void init_samr_user_info25(struct samr_UserInfo25 *r,
     7361                           NTTIME last_logon,
     7362                           NTTIME last_logoff,
     7363                           NTTIME last_password_change,
     7364                           NTTIME acct_expiry,
     7365                           NTTIME allow_password_change,
     7366                           NTTIME force_password_change,
     7367                           const char *account_name,
     7368                           const char *full_name,
     7369                           const char *home_directory,
     7370                           const char *home_drive,
     7371                           const char *logon_script,
     7372                           const char *profile_path,
     7373                           const char *description,
     7374                           const char *workstations,
     7375                           const char *comment,
     7376                           struct lsa_BinaryString *parameters,
     7377                           uint32_t rid,
     7378                           uint32_t primary_gid,
     7379                           uint32_t acct_flags,
     7380                           uint32_t fields_present,
     7381                           struct samr_LogonHours logon_hours,
     7382                           uint16_t bad_password_count,
     7383                           uint16_t logon_count,
     7384                           uint16_t country_code,
     7385                           uint16_t code_page,
     7386                           uint8_t nt_password_set,
     7387                           uint8_t lm_password_set,
     7388                           uint8_t password_expired,
     7389                           struct samr_CryptPasswordEx *pwd_buf);
     7390void init_samr_user_info26(struct samr_UserInfo26 *r,
     7391                           struct samr_CryptPasswordEx *pwd_buf,
     7392                           uint8_t password_expired);
     7393void init_samr_CryptPasswordEx(const char *pwd,
     7394                               DATA_BLOB *session_key,
     7395                               struct samr_CryptPasswordEx *pwd_buf);
     7396void init_samr_CryptPassword(const char *pwd,
     7397                             DATA_BLOB *session_key,
     7398                             struct samr_CryptPassword *pwd_buf);
    73397399
    73407400/* The following definitions come from rpc_client/init_srvsvc.c  */
    … …  
    81618221int elog_tdb_size( TDB_CONTEXT * tdb, int *MaxSize, int *Retention );
    81628222bool prune_eventlog( TDB_CONTEXT * tdb );
    8163 bool can_write_to_eventlog( TDB_CONTEXT * tdb, int32 needed );
     8223bool can_write_to_eventlog( TDB_CONTEXT * tdb, int32_t needed );
    81648224ELOG_TDB *elog_open_tdb( char *logname, bool force_clear );
    81658225int elog_close_tdb( ELOG_TDB *etdb, bool force_close );
    … …  
    94839543files_struct *file_fsp(uint16 fid);
    94849544void file_chain_reset(void);
    9485 NTSTATUS dup_file_fsp(files_struct *fsp,
    9486                                 uint32 access_mask,
    9487                                 uint32 share_access,
    9488                                 uint32 create_options,
    9489                                 files_struct **result);
     9545void dup_file_fsp(files_struct *from,
     9546                        uint32 access_mask,
     9547                        uint32 share_access,
     9548                        uint32 create_options,
     9549                        files_struct *to);
    94909550
    94919551/* The following definitions come from smbd/ipc.c  */
    … …  
    1005110111                                 const struct nt_user_token *token,
    1005210112                                 const char **list);
    10053 bool user_ok_token(const char *username, struct nt_user_token *token, int snum);
     10113bool user_ok_token(const char *username, const struct nt_user_token *token, int snum);
    1005410114bool is_share_read_only_for_token(const char *username,
    10055                                   struct nt_user_token *token, int snum);
     10115                                const struct nt_user_token *token,
     10116                                connection_struct *conn);
    1005610117
    1005710118/* The following definitions come from smbd/srvstr.c  */

  • branches/samba-3.2.x/source/include/rpc_lsa.h

    r133 r228  
    4040
    4141#define LSA_POLICY_READ       ( STANDARD_RIGHTS_READ_ACCESS      |\
     42                            LSA_POLICY_VIEW_LOCAL_INFORMATION    |\
    4243                            LSA_POLICY_VIEW_AUDIT_INFORMATION    |\
    4344                            LSA_POLICY_GET_PRIVATE_INFORMATION)

  • branches/samba-3.2.x/source/include/smb.h

    r204 r228  
    423423struct uuid;
    424424struct named_mutex;
     425struct pcap_cache;
    425426
    426427struct vfs_fsp_data {

  • branches/samba-3.2.x/source/include/version.h

    r205 r228  
    22#define SAMBA_VERSION_MAJOR 3
    33#define SAMBA_VERSION_MINOR 2
    4 #define SAMBA_VERSION_RELEASE 5
    5 #define SAMBA_VERSION_OFFICIAL_STRING "3.2.5"
     4#define SAMBA_VERSION_RELEASE 6
     5#define SAMBA_VERSION_OFFICIAL_STRING "3.2.6"
    66#define SAMBA_VERSION_STRING samba_version_string()

  • branches/samba-3.2.x/source/include/vfs_macros.h

    r137 r228  
    9494/* POSIX ACL operations. */
    9595#define SMB_VFS_CHMOD_ACL(conn, name, mode) ((conn)->vfs.ops.chmod_acl((conn)->vfs.handles.chmod_acl, (name), (mode)))
    96 #define SMB_VFS_FCHMOD_ACL(fsp, mode) ((fsp)->conn->vfs.ops.fchmod_acl((fsp)->conn->vfs.handles.chmod_acl, (fsp), (mode)))
     96#define SMB_VFS_FCHMOD_ACL(fsp, mode) ((fsp)->conn->vfs.ops.fchmod_acl((fsp)->conn->vfs.handles.fchmod_acl, (fsp), (mode)))
    9797
    9898#define SMB_VFS_SYS_ACL_GET_ENTRY(conn, theacl, entry_id, entry_p) ((conn)->vfs.ops.sys_acl_get_entry((conn)->vfs.handles.sys_acl_get_entry, (theacl), (entry_id), (entry_p)))
    … …  
    220220/* POSIX ACL operations. */
    221221#define SMB_VFS_OPAQUE_CHMOD_ACL(conn, name, mode) ((conn)->vfs_opaque.ops.chmod_acl((conn)->vfs_opaque.handles.chmod_acl, (name), (mode)))
    222 #define SMB_VFS_OPAQUE_FCHMOD_ACL(fsp, mode) ((fsp)->conn->vfs_opaque.ops.fchmod_acl((fsp)->conn->vfs_opaque.handles.chmod_acl, (fsp), (mode)))
     222#define SMB_VFS_OPAQUE_FCHMOD_ACL(fsp, mode) ((fsp)->conn->vfs_opaque.ops.fchmod_acl((fsp)->conn->vfs_opaque.handles.fchmod_acl, (fsp), (mode)))
    223223
    224224#define SMB_VFS_OPAQUE_SYS_ACL_GET_ENTRY(conn, theacl, entry_id, entry_p) ((conn)->vfs_opaque.ops.sys_acl_get_entry((conn)->vfs_opaque.handles.sys_acl_get_entry, (theacl), (entry_id), (entry_p)))
    … …  
    347347/* POSIX ACL operations. */
    348348#define SMB_VFS_NEXT_CHMOD_ACL(handle, name, mode) ((handle)->vfs_next.ops.chmod_acl((handle)->vfs_next.handles.chmod_acl, (name), (mode)))
    349 #define SMB_VFS_NEXT_FCHMOD_ACL(handle, fsp, mode) ((handle)->vfs_next.ops.fchmod_acl((handle)->vfs_next.handles.chmod_acl, (fsp), (mode)))
     349#define SMB_VFS_NEXT_FCHMOD_ACL(handle, fsp, mode) ((handle)->vfs_next.ops.fchmod_acl((handle)->vfs_next.handles.fchmod_acl, (fsp), (mode)))
    350350
    351351#define SMB_VFS_NEXT_SYS_ACL_GET_ENTRY(handle, theacl, entry_id, entry_p) ((handle)->vfs_next.ops.sys_acl_get_entry((handle)->vfs_next.handles.sys_acl_get_entry, (theacl), (entry_id), (entry_p)))
Note: See TracChangeset for help on using the changeset viewer.