Ignore:
Timestamp:
May 24, 2009, 7:51:24 AM (16 years ago)
Author:
Herwig Bauernfeind
Message:

Update Samba 3.3 branch to 3.3.3

Location:
branches/samba-3.3.x/source/include
Files:
9 edited

Legend:

Unmodified
Added
Removed

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

    r222 r223  
    201201/* Define to 1 if you have the <attr/xattr.h> header file. */
    202202#undef HAVE_ATTR_XATTR_H
     203
     204/* Define to 1 if you have the <avahi-client/client.h> header file. */
     205#undef HAVE_AVAHI_CLIENT_CLIENT_H
     206
     207/* Define to 1 if you have the `avahi_client_new' function. */
     208#undef HAVE_AVAHI_CLIENT_NEW
     209
     210/* Define to 1 if you have the <avahi-common/watch.h> header file. */
     211#undef HAVE_AVAHI_COMMON_WATCH_H
    203212
    204213/* Define to 1 if you have the `backtrace_symbols' function. */
    … …  
    10831092/* Define to 1 if you have the `asn1' library (-lasn1). */
    10841093#undef HAVE_LIBASN1
     1094
     1095/* Define to 1 if you have the `avahi-client' library (-lavahi-client). */
     1096#undef HAVE_LIBAVAHI_CLIENT
    10851097
    10861098/* Define to 1 if you have the `com_err' library (-lcom_err). */
    … …  
    27902802#undef WITH_AUTOMOUNT
    27912803
     2804/* Whether to enable avahi support */
     2805#undef WITH_AVAHI_SUPPORT
     2806
    27922807/* Whether to build mount.cifs and umount.cifs */
    27932808#undef WITH_CIFSMOUNT
    … …  
    31893204#undef vfs_default_quota_init
    31903205
     3206/* Whether to build vfs_dirsort as shared module */
     3207#undef vfs_dirsort_init
     3208
    31913209/* Whether to build vfs_expand_msdfs as shared module */
    31923210#undef vfs_expand_msdfs_init

  • branches/samba-3.3.x/source/include/dbwrap.h

    r206 r223  
    4646        int (*transaction_commit)(struct db_context *db);
    4747        int (*transaction_cancel)(struct db_context *db);
     48        int (*parse_record)(struct db_context *db, TDB_DATA key,
     49                            int (*parser)(TDB_DATA key, TDB_DATA data,
     50                                          void *private_data),
     51                            void *private_data);
    4852        void *private_data;
    4953        bool persistent;
    5054};
     55
     56bool db_is_local(const char *name);
    5157
    5258struct db_context *db_open(TALLOC_CTX *mem_ctx,

  • branches/samba-3.3.x/source/include/includes.h

    r222 r223  
    731731
    732732#include "lib/smbconf/smbconf.h"
     733#include "lib/smbconf/smbconf_init.h"
     734#include "lib/smbconf/smbconf_reg.h"
     735#include "lib/smbconf/smbconf_txt.h"
    733736
    734737/* Defines for wisXXX functions. */

  • branches/samba-3.3.x/source/include/nt_status.h

    r206 r223  
    8484} while (0)
    8585
     86#define W_ERROR_NOT_OK_GOTO_DONE(x) do { \
     87        if (!W_ERROR_IS_OK(x)) {\
     88                goto done;\
     89        }\
     90} while (0)
     91
     92#define W_ERROR_NOT_OK_GOTO(x, y) do {\
     93        if (!W_ERROR_IS_OK(x)) {\
     94                goto y;\
     95        }\
     96} while(0)
     97
    8698/* The top byte in an NTSTATUS code is used as a type field.
    8799 * Windows only uses value 0xC0 as an indicator for an NT error

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

    r222 r223  
    67226722WERROR regdb_open( void );
    67236723int regdb_close( void );
     6724WERROR regdb_transaction_start(void);
     6725WERROR regdb_transaction_commit(void);
     6726WERROR regdb_transaction_cancel(void);
    67246727int regdb_get_seqnum(void);
    6725 bool regdb_store_keys(const char *key, REGSUBKEY_CTR *ctr);
    6726 int regdb_fetch_keys(const char *key, REGSUBKEY_CTR *ctr);
     6728bool regdb_store_keys(const char *key, struct regsubkey_ctr *ctr);
     6729int regdb_fetch_keys(const char *key, struct regsubkey_ctr *ctr);
    67276730int regdb_fetch_values( const char* key, REGVAL_CTR *values );
    67286731bool regdb_store_values( const char *key, REGVAL_CTR *values );
    6729 bool regdb_subkeys_need_update(REGSUBKEY_CTR *subkeys);
     6732bool regdb_subkeys_need_update(struct regsubkey_ctr *subkeys);
    67306733bool regdb_values_need_update(REGVAL_CTR *values);
    67316734
    … …  
    67636766/* The following definitions come from registry/reg_dispatcher.c  */
    67646767
    6765 bool store_reg_keys( REGISTRY_KEY *key, REGSUBKEY_CTR *subkeys );
     6768bool store_reg_keys( REGISTRY_KEY *key, struct regsubkey_ctr *subkeys );
    67666769bool store_reg_values( REGISTRY_KEY *key, REGVAL_CTR *val );
    6767 int fetch_reg_keys( REGISTRY_KEY *key, REGSUBKEY_CTR *subkey_ctr );
     6770WERROR create_reg_subkey(REGISTRY_KEY *key, const char *subkey);
     6771WERROR delete_reg_subkey(REGISTRY_KEY *key, const char *subkey);
     6772int fetch_reg_keys( REGISTRY_KEY *key, struct regsubkey_ctr *subkey_ctr );
    67686773int fetch_reg_values( REGISTRY_KEY *key, REGVAL_CTR *val );
    67696774bool regkey_access_check( REGISTRY_KEY *key, uint32 requested, uint32 *granted,
    … …  
    67736778WERROR regkey_set_secdesc(REGISTRY_KEY *key,
    67746779                          struct security_descriptor *psecdesc);
    6775 bool reg_subkeys_need_update(REGISTRY_KEY *key, REGSUBKEY_CTR *subkeys);
     6780bool reg_subkeys_need_update(REGISTRY_KEY *key, struct regsubkey_ctr *subkeys);
    67766781bool reg_values_need_update(REGISTRY_KEY *key, REGVAL_CTR *values);
    67776782
    … …  
    67996804/* The following definitions come from registry/reg_objects.c  */
    68006805
    6801 WERROR regsubkey_ctr_addkey( REGSUBKEY_CTR *ctr, const char *keyname );
    6802 int regsubkey_ctr_delkey( REGSUBKEY_CTR *ctr, const char *keyname );
    6803 bool regsubkey_ctr_key_exists( REGSUBKEY_CTR *ctr, const char *keyname );
    6804 int regsubkey_ctr_numkeys( REGSUBKEY_CTR *ctr );
    6805 char* regsubkey_ctr_specific_key( REGSUBKEY_CTR *ctr, uint32 key_index );
     6806WERROR regsubkey_ctr_init(TALLOC_CTX *mem_ctx, struct regsubkey_ctr **ctr);
     6807WERROR regsubkey_ctr_set_seqnum(struct regsubkey_ctr *ctr, int seqnum);
     6808int regsubkey_ctr_get_seqnum(struct regsubkey_ctr *ctr);
     6809WERROR regsubkey_ctr_addkey( struct regsubkey_ctr *ctr, const char *keyname );
     6810WERROR regsubkey_ctr_delkey( struct regsubkey_ctr *ctr, const char *keyname );
     6811bool regsubkey_ctr_key_exists( struct regsubkey_ctr *ctr, const char *keyname );
     6812int regsubkey_ctr_numkeys( struct regsubkey_ctr *ctr );
     6813char* regsubkey_ctr_specific_key( struct regsubkey_ctr *ctr, uint32 key_index );
    68066814int regval_ctr_numvals( REGVAL_CTR *ctr );
    68076815REGISTRY_VALUE* dup_registry_value( REGISTRY_VALUE *val );
    … …  
    97449752NTSTATUS nss_info_template_init( void );
    97459753
     9754/* The following definitions come from lib/avahi.c */
     9755
     9756struct AvahiPoll *tevent_avahi_poll(TALLOC_CTX *mem_ctx,
     9757                                    struct event_context *ev);
     9758
     9759/* The following definitions come from smbd/avahi_register.c */
     9760
     9761void *avahi_start_register(TALLOC_CTX *mem_ctx, struct event_context *ev,
     9762                           uint16_t port);
     9763
    97469764#endif /*  _PROTO_H_  */

  • branches/samba-3.3.x/source/include/reg_db.h

    r206 r223  
    2727#define REG_VALUE_PREFIX    "SAMBA_REGVAL"
    2828#define REG_SECDESC_PREFIX  "SAMBA_SECDESC"
     29#define REG_SORTED_SUBKEYS_PREFIX  "SAMBA_SORTED_SUBKEYS"
    2930
    3031#endif /* _REG_DB_H */

  • branches/samba-3.3.x/source/include/reg_objects.h

    r206 r223  
    6767/* container for registry subkey names */
    6868
    69 typedef struct {
    70         uint32          num_subkeys;
    71         char            **subkeys;
    72         int seqnum;
    73 } REGSUBKEY_CTR;
     69struct regsubkey_ctr;
    7470
    7571/*
    … …  
    133129typedef struct {
    134130        /* functions for enumerating subkeys and values */     
    135         int     (*fetch_subkeys)( const char *key, REGSUBKEY_CTR *subkeys);
     131        int     (*fetch_subkeys)( const char *key, struct regsubkey_ctr *subkeys);
    136132        int     (*fetch_values) ( const char *key, REGVAL_CTR *val );
    137         bool    (*store_subkeys)( const char *key, REGSUBKEY_CTR *subkeys );
     133        bool    (*store_subkeys)( const char *key, struct regsubkey_ctr *subkeys );
     134        WERROR  (*create_subkey)(const char *key, const char *subkey);
     135        WERROR  (*delete_subkey)(const char *key, const char *subkey);
    138136        bool    (*store_values)( const char *key, REGVAL_CTR *val );
    139137        bool    (*reg_access_check)( const char *keyname, uint32 requested,
    … …  
    144142        WERROR (*set_secdesc)(const char *key,
    145143                              struct security_descriptor *sec_desc);
    146         bool    (*subkeys_need_update)(REGSUBKEY_CTR *subkeys);
     144        bool    (*subkeys_need_update)(struct regsubkey_ctr *subkeys);
    147145        bool    (*values_need_update)(REGVAL_CTR *values);
    148146} REGISTRY_OPS;
    … …  
    165163struct registry_key {
    166164        REGISTRY_KEY *key;
    167         REGSUBKEY_CTR *subkeys;
     165        struct regsubkey_ctr *subkeys;
    168166        REGVAL_CTR *values;
    169167        struct nt_user_token *token;

  • branches/samba-3.3.x/source/include/regfio.h

    r206 r223  
    215215REGF_NK_REC*  regfio_fetch_subkey( REGF_FILE *file, REGF_NK_REC *nk );
    216216REGF_NK_REC*  regfio_write_key ( REGF_FILE *file, const char *name,
    217                                  REGVAL_CTR *values, REGSUBKEY_CTR *subkeys,
     217                                 REGVAL_CTR *values, struct regsubkey_ctr *subkeys,
    218218                                 SEC_DESC *sec_desc, REGF_NK_REC *parent );
    219219

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

    r222 r223  
    22#define SAMBA_VERSION_MAJOR 3
    33#define SAMBA_VERSION_MINOR 3
    4 #define SAMBA_VERSION_RELEASE 2
    5 #define SAMBA_VERSION_OFFICIAL_STRING "3.3.2"
     4#define SAMBA_VERSION_RELEASE 3
     5#define SAMBA_VERSION_OFFICIAL_STRING "3.3.3"
    66#define SAMBA_VERSION_STRING samba_version_string()
Note: See TracChangeset for help on using the changeset viewer.