Ignore:
Timestamp:
Nov 27, 2012, 4:56:06 PM (13 years ago)
Author:
Silvan Scherrer
Message:

Samba Server: updated vendor to 3.6.9

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

Legend:

Unmodified
Added
Removed

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

    r740 r746  
    6262                char *schema_path;
    6363                char *config_path;
     64                int ldap_page_size;
    6465        } config;
    6566

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

    r740 r746  
    634634#undef HAVE_FSEEK64
    635635
     636/* Define to 1 if you have the `fseeko' function. */
     637#undef HAVE_FSEEKO
     638
    636639/* Define to 1 if you have the `fseeko64' function. */
    637640#undef HAVE_FSEEKO64
    … …  
    919922#undef HAVE_INO64_T
    920923
    921 /* Whether kernel has inotify support */
     924/* Whether kernel or sys has inotify support */
    922925#undef HAVE_INOTIFY
    923926
    … …  
    11111114#undef HAVE_KRB5_KU_OTHER_CKSUM
    11121115
    1113 /* Define to 1 if you have the `krb5_locate_kdc' function. */
    1114 #undef HAVE_KRB5_LOCATE_KDC
    1115 
    11161116/* Define to 1 if you have the <krb5/locate_plugin.h> header file. */
    11171117#undef HAVE_KRB5_LOCATE_PLUGIN_H
    … …  
    12731273#undef HAVE_LIBLDAP
    12741274
     1275/* Whether libmd5 conformant to rfc1321 is available. */
     1276#undef HAVE_LIBMD5
     1277
    12751278/* Define to 1 if you have the `nscd' library (-lnscd). */
    12761279#undef HAVE_LIBNSCD
    … …  
    14161419/* Whether the macro for makedev is available */
    14171420#undef HAVE_MAKEDEV
     1421
     1422/* Whether md5.h is available. */
     1423#undef HAVE_MD5_H
    14181424
    14191425/* Define to 1 if you have the `memalign' function. */
    … …  
    33743380#undef vfs_aio_fork_init
    33753381
     3382/* Whether to build vfs_aio_pthread as shared module */
     3383#undef vfs_aio_pthread_init
     3384
    33763385/* Whether to build vfs_aixacl2 as shared module */
    33773386#undef vfs_aixacl2_init

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

    r740 r746  
    135135NTSTATUS dbwrap_traverse(struct db_context *db,
    136136                         int (*f)(struct db_record*, void*),
    137                          void *private_data);
     137                         void *private_data,
     138                         int *count);
    138139
    139140NTSTATUS dbwrap_delete_bystring_upper(struct db_context *db, const char *key);

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

    r740 r746  
    7272bool get_auth_data_from_tkt(TALLOC_CTX *mem_ctx, DATA_BLOB *auth_data, krb5_ticket *tkt);
    7373krb5_const_principal get_principal_from_tkt(krb5_ticket *tkt);
    74 krb5_error_code smb_krb5_locate_kdc(krb5_context ctx, const krb5_data *realm, struct sockaddr **addr_pp, int *naddrs, int get_masters);
    75 #if defined(HAVE_KRB5_LOCATE_KDC)
    76 krb5_error_code krb5_locate_kdc(krb5_context ctx, const krb5_data *realm, struct sockaddr **addr_pp, int *naddrs, int get_masters);
    77 #endif
    7874krb5_error_code get_kerberos_allowed_etypes(krb5_context context, krb5_enctype **enctypes);
    7975bool get_krb5_smb_session_key(TALLOC_CTX *mem_ctx,

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

    r740 r746  
    262262#define SERVER_NDR_PADDING_SIZE 8
    263263
    264 #define DEFAULT_SMB2_MAX_READ (1024*1024)
    265 #define DEFAULT_SMB2_MAX_WRITE (1024*1024)
    266 #define DEFAULT_SMB2_MAX_TRANSACT (1024*1024)
     264#define DEFAULT_SMB2_MAX_READ (64*1024)
     265#define DEFAULT_SMB2_MAX_WRITE (64*1024)
     266#define DEFAULT_SMB2_MAX_TRANSACT (64*1024)
    267267#define DEFAULT_SMB2_MAX_CREDITS 8192
    268 #define DEFAULT_SMB2_MAX_CREDIT_BITMAP_FACTOR 2
    269 
    270 #endif
     268
     269#endif

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

    r740 r746  
    177177                        struct messaging_context *msg_ctx,
    178178                        const char *printer);
     179void nt_printer_add(TALLOC_CTX *mem_ctx,
     180                    const struct auth_serversupplied_info *server_info,
     181                    struct messaging_context *msg_ctx,
     182                    const char *printer);
    179183
    180184#endif /* NT_PRINTING_H_ */

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

    r740 r746  
    3232/* invoked from tools via a specialized hook into the VFS rather than via the            */
    3333/* standard vfs entry points */
    34 #define FSCTL_REQUEST_OPLOCK_LEVEL_1 0x00090000
    35 #define FSCTL_REQUEST_OPLOCK_LEVEL_2 0x00090004
    36 #define FSCTL_REQUEST_BATCH_OPLOCK   0x00090008
    3734#define FSCTL_LOCK_VOLUME            0x00090018
    3835#define FSCTL_UNLOCK_VOLUME          0x0009001C
    3936#define FSCTL_GET_COMPRESSION        0x0009003C
    4037#define FSCTL_SET_COMPRESSION        0x0009C040
    41 #define FSCTL_IS_VOLUME_DIRTY        0x00090078
    4238#define FSCTL_REQUEST_FILTER_OPLOCK  0x0009008C
    43 #define FSCTL_FIND_FILES_BY_SID      0x0009008F
    44 #define FSCTL_FILESYS_GET_STATISTICS 0x00090090
    45 #define FSCTL_SET_OBJECT_ID          0x00090098
    46 #define FSCTL_GET_OBJECT_ID          0x0009009C
    47 #define FSCTL_SET_REPARSE_POINT      0x000900A4
    48 #define FSCTL_GET_REPARSE_POINT      0x000900A8
    49 #define FSCTL_DELETE_REPARSE_POINT   0x000900AC
    50 #define FSCTL_CREATE_OR_GET_OBJECT_ID 0x000900C0
    51 #define FSCTL_SET_SPARSE             0x000900C4
    5239#define FSCTL_SET_ZERO_DATA          0x000900C8
    5340#define FSCTL_SET_ENCRYPTION         0x000900D7
    … …  
    5643#define FSCTL_READ_RAW_ENCRYPTED     0x000900E3
    5744#define FSCTL_SIS_COPYFILE           0x00090100
    58 #define FSCTL_QUERY_ALLOCATED_RANGES 0x000940CF
    5945#define FSCTL_SIS_LINK_FILES         0x0009C104
    6046
    61 #define FSCTL_GET_SHADOW_COPY_DATA   0x00144064   /* KJC -- Shadow Copy information */
     47/* filesystem control codes */
     48#define FSCTL_METHOD_BUFFERED   0x00000000
     49#define FSCTL_METHOD_IN_DIRECT  0x00000001
     50#define FSCTL_METHOD_OUT_DIRECT 0x00000002
     51#define FSCTL_METHOD_NEITHER    0x00000003
     52
     53#define FSCTL_ACCESS_ANY        0x00000000
     54#define FSCTL_ACCESS_READ       0x00004000
     55#define FSCTL_ACCESS_WRITE      0x00008000
     56
     57#define FSCTL_DFS                       0x00060000
     58#define FSCTL_DFS_GET_REFERRALS         (FSCTL_DFS | FSCTL_ACCESS_ANY | 0x0194 | FSCTL_METHOD_BUFFERED)
     59#define FSCTL_DFS_GET_REFERRALS_EX      (FSCTL_DFS | FSCTL_ACCESS_ANY | 0x01B0 | FSCTL_METHOD_BUFFERED)
     60
     61#define FSCTL_FILESYSTEM                0x00090000
     62#define FSCTL_REQUEST_OPLOCK_LEVEL_1    (FSCTL_FILESYSTEM | FSCTL_ACCESS_ANY | 0x0000 | FSCTL_METHOD_BUFFERED)
     63#define FSCTL_REQUEST_OPLOCK_LEVEL_2    (FSCTL_FILESYSTEM | FSCTL_ACCESS_ANY | 0x0004 | FSCTL_METHOD_BUFFERED)
     64#define FSCTL_REQUEST_BATCH_OPLOCK      (FSCTL_FILESYSTEM | FSCTL_ACCESS_ANY | 0x0008 | FSCTL_METHOD_BUFFERED)
     65#define FSCTL_OPLOCK_BREAK_ACKNOWLEDGE  (FSCTL_FILESYSTEM | FSCTL_ACCESS_ANY | 0x000C | FSCTL_METHOD_BUFFERED)
     66#define FSCTL_OPBATCH_ACK_CLOSE_PENDING (FSCTL_FILESYSTEM | FSCTL_ACCESS_ANY | 0x0010 | FSCTL_METHOD_BUFFERED)
     67#define FSCTL_OPLOCK_BREAK_NOTIFY       (FSCTL_FILESYSTEM | FSCTL_ACCESS_ANY | 0x0014 | FSCTL_METHOD_BUFFERED)
     68#define FSCTL_FILESYS_GET_STATISTICS    (FSCTL_FILESYSTEM | FSCTL_ACCESS_ANY | 0x0060 | FSCTL_METHOD_BUFFERED)
     69#define FSCTL_GET_NTFS_VOLUME_DATA      (FSCTL_FILESYSTEM | FSCTL_ACCESS_ANY | 0x0064 | FSCTL_METHOD_BUFFERED)
     70#define FSCTL_IS_VOLUME_DIRTY           (FSCTL_FILESYSTEM | FSCTL_ACCESS_ANY | 0x0078 | FSCTL_METHOD_BUFFERED)
     71#define FSCTL_FIND_FILES_BY_SID         (FSCTL_FILESYSTEM | FSCTL_ACCESS_ANY | 0x008C | FSCTL_METHOD_NEITHER)
     72#define FSCTL_SET_OBJECT_ID             (FSCTL_FILESYSTEM | FSCTL_ACCESS_ANY | 0x0098 | FSCTL_METHOD_BUFFERED)
     73#define FSCTL_GET_OBJECT_ID             (FSCTL_FILESYSTEM | FSCTL_ACCESS_ANY | 0x009C | FSCTL_METHOD_BUFFERED)
     74#define FSCTL_DELETE_OBJECT_ID          (FSCTL_FILESYSTEM | FSCTL_ACCESS_ANY | 0x00A0 | FSCTL_METHOD_BUFFERED)
     75#define FSCTL_SET_REPARSE_POINT         (FSCTL_FILESYSTEM | FSCTL_ACCESS_ANY | 0x00A4 | FSCTL_METHOD_BUFFERED)
     76#define FSCTL_GET_REPARSE_POINT         (FSCTL_FILESYSTEM | FSCTL_ACCESS_ANY | 0x00A8 | FSCTL_METHOD_BUFFERED)
     77#define FSCTL_DELETE_REPARSE_POINT      (FSCTL_FILESYSTEM | FSCTL_ACCESS_ANY | 0x00AC | FSCTL_METHOD_BUFFERED)
     78#define FSCTL_CREATE_OR_GET_OBJECT_ID   (FSCTL_FILESYSTEM | FSCTL_ACCESS_ANY | 0x00C0 | FSCTL_METHOD_BUFFERED)
     79#define FSCTL_SET_SPARSE                (FSCTL_FILESYSTEM | FSCTL_ACCESS_ANY | 0x00C4 | FSCTL_METHOD_BUFFERED)
     80#define FSCTL_QUERY_ALLOCATED_RANGES    (FSCTL_FILESYSTEM | FSCTL_ACCESS_READ | 0x00CC | FSCTL_METHOD_NEITHER)
     81#define FSCTL_FILE_LEVEL_TRIM           (FSCTL_FILESYSTEM | FSCTL_ACCESS_WRITE | 0x0208 | FSCTL_METHOD_BUFFERED)
     82#define FSCTL_OFFLOAD_READ              (FSCTL_FILESYSTEM | FSCTL_ACCESS_READ | 0x0264 | FSCTL_METHOD_BUFFERED)
     83#define FSCTL_OFFLOAD_WRITE             (FSCTL_FILESYSTEM | FSCTL_ACCESS_WRITE | 0x0268 | FSCTL_METHOD_BUFFERED)
     84
     85#define FSCTL_NAMED_PIPE                0x00110000
     86#define FSCTL_PIPE_PEEK                 (FSCTL_NAMED_PIPE | FSCTL_ACCESS_READ | 0x000C | FSCTL_METHOD_BUFFERED)
     87#define FSCTL_NAMED_PIPE_READ_WRITE     (FSCTL_NAMED_PIPE | FSCTL_ACCESS_READ \
     88                                                          | FSCTL_ACCESS_WRITE | 0x0014 | FSCTL_METHOD_NEITHER)
     89#define FSCTL_PIPE_TRANSCEIVE           FSCTL_NAMED_PIPE_READ_WRITE     /* SMB2 function name */
     90#define FSCTL_PIPE_WAIT                 (FSCTL_NAMED_PIPE | FSCTL_ACCESS_ANY | 0x0018 | FSCTL_METHOD_BUFFERED)
     91
     92#define FSCTL_NETWORK_FILESYSTEM        0x00140000
     93#define FSCTL_GET_SHADOW_COPY_DATA      (FSCTL_NETWORK_FILESYSTEM | FSCTL_ACCESS_READ | 0x0064 | FSCTL_METHOD_BUFFERED)
     94#define FSCTL_SRV_ENUM_SNAPS            FSCTL_GET_SHADOW_COPY_DATA      /* SMB2 function name */
     95#define FSCTL_SRV_REQUEST_RESUME_KEY    (FSCTL_NETWORK_FILESYSTEM | FSCTL_ACCESS_ANY | 0x0078 | FSCTL_METHOD_BUFFERED)
     96#define FSCTL_SRV_COPYCHUNK             (FSCTL_NETWORK_FILESYSTEM | FSCTL_ACCESS_READ | 0x00F0 | FSCTL_METHOD_OUT_DIRECT)
     97#define FSCTL_SRV_COPYCHUNK_WRITE       (FSCTL_NETWORK_FILESYSTEM | FSCTL_ACCESS_WRITE | 0x00F0 | FSCTL_METHOD_OUT_DIRECT)
     98#define FSCTL_SRV_READ_HASH             (FSCTL_NETWORK_FILESYSTEM | FSCTL_ACCESS_READ| 0x01B8 | FSCTL_METHOD_NEITHER)
     99#define FSCTL_LMR_REQ_RESILIENCY        (FSCTL_NETWORK_FILESYSTEM | FSCTL_ACCESS_ANY | 0x01D4 | FSCTL_METHOD_BUFFERED)
     100#define FSCTL_LMR_SET_LINK_TRACKING_INFORMATION \
     101        (FSCTL_NETWORK_FILESYSTEM | FSCTL_ACCESS_ANY | 0x00EC | FSCTL_METHOD_BUFFERED)
     102#define FSCTL_QUERY_NETWORK_INTERFACE_INFO \
     103        (FSCTL_NETWORK_FILESYSTEM | FSCTL_ACCESS_ANY | 0x01FC | FSCTL_METHOD_BUFFERED)
     104
     105/*
     106 * FSCTL_VALIDATE_NEGOTIATE_INFO_224 was used used in
     107 * Windows 8 server beta with SMB 2.24
     108 */
     109#define FSCTL_VALIDATE_NEGOTIATE_INFO_224 \
     110        (FSCTL_NETWORK_FILESYSTEM | FSCTL_ACCESS_ANY | 0x0200 | FSCTL_METHOD_BUFFERED)
     111#define FSCTL_VALIDATE_NEGOTIATE_INFO   (FSCTL_NETWORK_FILESYSTEM | FSCTL_ACCESS_ANY | 0x0204 | FSCTL_METHOD_BUFFERED)
    62112
    63113#if 0

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

    r740 r746  
    4747
    4848typedef struct _print_queue_struct {
    49         int job;                /* normally the UNIX jobid -- see note in
     49        int sysjob;             /* normally the UNIX jobid -- see note in
    5050                                   printing.c:traverse_fn_delete() */
    5151        int size;
    … …  
    6969struct printjob {
    7070        pid_t pid; /* which process launched the job */
     71        uint32_t jobid; /* the spoolss print job identifier */
    7172        int sysjob; /* the system (lp) job number */
    7273        int fd; /* file descriptor of open file if open */
    … …  
    101102  int (*job_pause)(int snum, struct printjob *pjob);
    102103  int (*job_resume)(int snum, struct printjob *pjob);
    103   int (*job_submit)(int snum, struct printjob *pjob);
     104  int (*job_submit)(int snum, struct printjob *pjob,
     105                    enum printing_types printing_type,
     106                    char *lpq_command);
    104107};
    105108
    … …  
    124127#define PRINT_SPOOL_PREFIX "smbprn."
    125128#endif
    126 #define PRINT_DATABASE_VERSION 7
     129#define PRINT_DATABASE_VERSION 8
    127130
    128131#ifdef AIX
    … …  
    195198bool print_notify_deregister_pid(int snum);
    196199bool print_job_exists(const char* sharename, uint32 jobid);
    197 char *print_job_fname(const char* sharename, uint32 jobid);
    198 struct spoolss_DeviceMode *print_job_devmode(const char* sharename, uint32 jobid);
     200struct spoolss_DeviceMode *print_job_devmode(TALLOC_CTX *mem_ctx,
     201                                             const char *sharename,
     202                                             uint32 jobid);
    199203bool print_job_set_name(struct tevent_context *ev,
    200204                        struct messaging_context *msg_ctx,
    … …  
    204208                        struct messaging_context *msg_ctx,
    205209                        int snum, uint32_t jobid);
    206 bool print_job_pause(const struct auth_serversupplied_info *server_info,
     210WERROR print_job_pause(const struct auth_serversupplied_info *server_info,
    207211                     struct messaging_context *msg_ctx,
    208                      int snum, uint32 jobid, WERROR *errcode);
    209 bool print_job_resume(const struct auth_serversupplied_info *server_info,
     212                     int snum, uint32 jobid);
     213WERROR print_job_resume(const struct auth_serversupplied_info *server_info,
    210214                      struct messaging_context *msg_ctx,
    211                       int snum, uint32 jobid, WERROR *errcode);
     215                      int snum, uint32 jobid);
    212216ssize_t print_job_write(struct tevent_context *ev,
    213217                        struct messaging_context *msg_ctx,
    … …  
    246250                     print_queue_struct *buf,
    247251                     print_status_struct *status,bool first);
    248 uint32_t print_parse_jobid(const char *fname);
    249252
    250253/* The following definitions come from printing/printing_db.c  */

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

    r740 r746  
    706706int timeval_to_msec(struct timeval t);
    707707char *valid_share_pathname(TALLOC_CTX *ctx, const char *dos_pathname);
     708bool is_executable(const char *fname);
     709bool map_open_params_to_ntcreate(const char *smb_base_fname,
     710                                 int deny_mode, int open_func,
     711                                 uint32 *paccess_mask,
     712                                 uint32 *pshare_mode,
     713                                 uint32 *pcreate_disposition,
     714                                 uint32 *pcreate_options,
     715                                 uint32_t *pprivate_flags);
    708716
    709717/* The following definitions come from lib/util_cmdline.c  */
    … …  
    802810                              struct dom_sid **user_sids,
    803811                              uint32_t *num_user_sids,
    804                               bool include_user_group_rid,
    805                               bool skip_ressource_groups);
     812                              bool include_user_group_rid);
    806813
    807814/* The following definitions come from lib/util_sock.c  */
    … …  
    13311338
    13321339char *lp_smb_ports(void);
    1333 char *lp_dos_charset(void);
    1334 char *lp_unix_charset(void);
    1335 char *lp_display_charset(void);
     1340const char *lp_dos_charset(void);
     1341const char *lp_unix_charset(void);
     1342const char *lp_display_charset(void);
    13361343char *lp_logfile(void);
    13371344char *lp_configfile(void);
    … …  
    16291636bool lp_onlyuser(int );
    16301637bool lp_manglednames(const struct share_params *p );
     1638bool lp_allow_insecure_widelinks(void);
    16311639bool lp_widelinks(int );
    16321640bool lp_symlinks(int );

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

    r740 r746  
    2222
    2323#include "includes.h"
     24
     25/** Don't verify this unique id */
     26#define SERVERID_UNIQUE_ID_NOT_TO_VERIFY 0xFFFFFFFFFFFFFFFFULL
    2427
    2528/*
    … …  
    6568bool serverid_parent_init(TALLOC_CTX *mem_ctx);
    6669
     70/*
     71 * Get a random unique_id and make sure that it is not
     72 * SERVERID_UNIQUE_ID_NOT_TO_VERIFY
     73 */
     74uint64_t serverid_get_random_unique_id(void);
     75
    6776#endif

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

    r740 r746  
    638638        uint32_t name_hash;
    639639        struct security_unix_token *delete_token;
     640        struct security_token *delete_nt_token;
    640641};
    641642
    … …  
    17151716#define UCF_COND_ALLOW_WCARD_LCOMP      0x00000004
    17161717#define UCF_POSIX_PATHNAMES             0x00000008
     1718#define UCF_UNIX_NAME_LOOKUP            0x00000010
    17171719
    17181720/*

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

    r740 r746  
    22#define SAMBA_VERSION_MAJOR 3
    33#define SAMBA_VERSION_MINOR 6
    4 #define SAMBA_VERSION_RELEASE 0
    5 #define SAMBA_VERSION_OFFICIAL_STRING "3.6.0"
     4#define SAMBA_VERSION_RELEASE 9
     5#define SAMBA_VERSION_OFFICIAL_STRING "3.6.9"
    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.