Ignore:
Timestamp:
Nov 14, 2012, 12:59:34 PM (13 years ago)
Author:
Silvan Scherrer
Message:

Samba Server: update vendor to 3.6.0

Location:
vendor/current/source4/dynconfig
Files:
1 added
1 deleted
2 edited

Legend:

Unmodified
Added
Removed

  • vendor/current/source4/dynconfig/dynconfig.c

    r414 r740  
    4141 **/
    4242
    43 /** Directory with generic binaries */
    44 _PUBLIC_ const char *dyn_BINDIR = BINDIR;
     43#include "dynconfig.h"
    4544
    46 /**< Location of smb.conf file. **/
    47 _PUBLIC_ const char *dyn_CONFIGFILE = CONFIGFILE;
     45#define DEFINE_DYN_CONFIG_PARAM(name) \
     46const char *dyn_##name = name; \
     47\
     48bool is_default_dyn_##name(void) \
     49{\
     50        if (strcmp(name, dyn_##name) == 0) { \
     51                return true; \
     52        } \
     53        return false; \
     54}\
     55\
     56const char *get_dyn_##name(void) \
     57{\
     58        return dyn_##name;\
     59}\
     60\
     61const char *set_dyn_##name(const char *newpath) \
     62{\
     63        if (newpath == NULL) { \
     64                return NULL; \
     65        } \
     66        if (strcmp(name, newpath) == 0) { \
     67                return dyn_##name; \
     68        } \
     69        newpath = strdup(newpath);\
     70        if (newpath == NULL) { \
     71                return NULL; \
     72        } \
     73        if (is_default_dyn_##name()) { \
     74                /* do not free a static string */ \
     75        } else if (dyn_##name) {\
     76                free(discard_const(dyn_##name)); \
     77        }\
     78        dyn_##name = newpath; \
     79        return dyn_##name;\
     80}
    4881
    49 /** Log file directory. **/
    50 _PUBLIC_ const char *dyn_LOGFILEBASE = LOGFILEBASE;
     82/* these are in common with s3 */
     83DEFINE_DYN_CONFIG_PARAM(SBINDIR)
     84DEFINE_DYN_CONFIG_PARAM(BINDIR)
     85DEFINE_DYN_CONFIG_PARAM(SWATDIR)
     86DEFINE_DYN_CONFIG_PARAM(CONFIGFILE) /**< Location of smb.conf file. **/
     87DEFINE_DYN_CONFIG_PARAM(LOGFILEBASE) /** Log file directory. **/
     88DEFINE_DYN_CONFIG_PARAM(LMHOSTSFILE) /** Statically configured LanMan hosts. **/
     89DEFINE_DYN_CONFIG_PARAM(CODEPAGEDIR)
     90DEFINE_DYN_CONFIG_PARAM(LIBDIR)
     91DEFINE_DYN_CONFIG_PARAM(MODULESDIR)
     92DEFINE_DYN_CONFIG_PARAM(SHLIBEXT)
     93DEFINE_DYN_CONFIG_PARAM(LOCKDIR)
     94DEFINE_DYN_CONFIG_PARAM(STATEDIR) /** Persistent state files. Default LOCKDIR */
     95DEFINE_DYN_CONFIG_PARAM(CACHEDIR) /** Temporary cache files. Default LOCKDIR */
     96DEFINE_DYN_CONFIG_PARAM(PIDDIR)
     97DEFINE_DYN_CONFIG_PARAM(NCALRPCDIR)
     98DEFINE_DYN_CONFIG_PARAM(SMB_PASSWD_FILE)
     99DEFINE_DYN_CONFIG_PARAM(PRIVATE_DIR)
     100DEFINE_DYN_CONFIG_PARAM(LOCALEDIR)
     101DEFINE_DYN_CONFIG_PARAM(NMBDSOCKETDIR)
    51102
    52 /** Directory for local RPC (ncalrpc: transport) */
    53 _PUBLIC_ const char *dyn_NCALRPCDIR = NCALRPCDIR;
    54 
    55 /** Statically configured LanMan hosts. **/
    56 _PUBLIC_ const char *dyn_LMHOSTSFILE = LMHOSTSFILE;
    57 
    58 /** Samba data directory. */
    59 _PUBLIC_ const char *dyn_DATADIR = DATADIR;
    60 
    61 _PUBLIC_ const char *dyn_MODULESDIR = MODULESDIR;
    62 
    63 /**
    64  * @brief Directory holding lock files.
    65  *
    66  * Not writable, but used to set a default in the parameter table.
    67  **/
    68 _PUBLIC_ const char *dyn_LOCKDIR = LOCKDIR;
    69 
    70 /** pid file directory */
    71 _PUBLIC_ const char *dyn_PIDDIR  = PIDDIR;
    72 
    73 /** Private data directory; holds ldb files and the like */
    74 _PUBLIC_ const char *dyn_PRIVATE_DIR = PRIVATE_DIR;
    75 
    76 /** SWAT  directory */
    77 _PUBLIC_ const char *dyn_SWATDIR = SWATDIR;
    78 
    79 /** SETUP files (source files used by the provision) */
    80 _PUBLIC_ const char *dyn_SETUPDIR = SETUPDIR;
    81 
    82 /** Where to find the winbindd socket */
    83 _PUBLIC_ const char *dyn_WINBINDD_SOCKET_DIR = WINBINDD_SOCKET_DIR;
    84 
    85 /** Where to find the winbindd privileged socket */
    86 _PUBLIC_ const char *dyn_WINBINDD_PRIVILEGED_SOCKET_DIR = WINBINDD_PRIVILEGED_SOCKET_DIR;
    87 
    88 /** Where to find the NTP signing deamon socket */
    89 _PUBLIC_ const char *dyn_NTP_SIGND_SOCKET_DIR = NTP_SIGND_SOCKET_DIR;
     103/* these are not in s3 */
     104DEFINE_DYN_CONFIG_PARAM(DATADIR)
     105DEFINE_DYN_CONFIG_PARAM(SETUPDIR)
     106DEFINE_DYN_CONFIG_PARAM(WINBINDD_SOCKET_DIR)
     107DEFINE_DYN_CONFIG_PARAM(WINBINDD_PRIVILEGED_SOCKET_DIR)
     108DEFINE_DYN_CONFIG_PARAM(NTP_SIGND_SOCKET_DIR)
     109DEFINE_DYN_CONFIG_PARAM(PYTHONDIR)
     110DEFINE_DYN_CONFIG_PARAM(PYTHONARCHDIR)
     111DEFINE_DYN_CONFIG_PARAM(SCRIPTSBINDIR)

  • vendor/current/source4/dynconfig/dynconfig.h

    r414 r740  
    2525 **/
    2626
    27 extern const char *dyn_BINDIR;
    28 extern const char *dyn_CONFIGFILE;
    29 extern const char *dyn_NCALRPCDIR;
    30 extern const char *dyn_LOGFILEBASE;
    31 extern const char *dyn_LMHOSTSFILE;
    32 extern const char *dyn_DATADIR;
    33 extern const char *dyn_MODULESDIR;
    34 extern const char *dyn_LOCKDIR;
    35 extern const char *dyn_PIDDIR;
    36 extern const char *dyn_PRIVATE_DIR;
    37 extern const char *dyn_SWATDIR;
    38 extern const char *dyn_JSDIR;
    39 extern const char *dyn_SETUPDIR;
    40 extern const char *dyn_WINBINDD_SOCKET_DIR;
    41 extern const char *dyn_WINBINDD_PRIVILEGED_SOCKET_DIR;
    42 extern const char *dyn_NTP_SIGND_SOCKET_DIR;
     27#define DEFINE_DYN_CONFIG_PROTO(name)                   \
     28extern const char *dyn_##name;                                  \
     29const char *get_dyn_##name(void);                       \
     30const char *set_dyn_##name(const char *newpath);        \
     31bool is_default_dyn_##name(void);
     32
     33/* these are in common with s3 */
     34DEFINE_DYN_CONFIG_PROTO(SBINDIR)
     35DEFINE_DYN_CONFIG_PROTO(BINDIR)
     36DEFINE_DYN_CONFIG_PROTO(SWATDIR)
     37DEFINE_DYN_CONFIG_PROTO(CONFIGFILE) /**< Location of smb.conf file. **/
     38DEFINE_DYN_CONFIG_PROTO(LOGFILEBASE) /** Log file directory. **/
     39DEFINE_DYN_CONFIG_PROTO(LMHOSTSFILE) /** Statically configured LanMan hosts. **/
     40DEFINE_DYN_CONFIG_PROTO(CODEPAGEDIR)
     41DEFINE_DYN_CONFIG_PROTO(LIBDIR)
     42DEFINE_DYN_CONFIG_PROTO(MODULESDIR)
     43DEFINE_DYN_CONFIG_PROTO(SHLIBEXT)
     44DEFINE_DYN_CONFIG_PROTO(LOCKDIR)
     45DEFINE_DYN_CONFIG_PROTO(STATEDIR) /** Persistent state files. Default LOCKDIR */
     46DEFINE_DYN_CONFIG_PROTO(CACHEDIR) /** Temporary cache files. Default LOCKDIR */
     47DEFINE_DYN_CONFIG_PROTO(PIDDIR)
     48DEFINE_DYN_CONFIG_PROTO(NCALRPCDIR)
     49DEFINE_DYN_CONFIG_PROTO(SMB_PASSWD_FILE)
     50DEFINE_DYN_CONFIG_PROTO(PRIVATE_DIR)
     51DEFINE_DYN_CONFIG_PROTO(LOCALEDIR)
     52DEFINE_DYN_CONFIG_PROTO(NMBDSOCKETDIR)
     53
     54/* these are not in s3 */
     55DEFINE_DYN_CONFIG_PROTO(DATADIR)
     56DEFINE_DYN_CONFIG_PROTO(SETUPDIR)
     57DEFINE_DYN_CONFIG_PROTO(WINBINDD_SOCKET_DIR)
     58DEFINE_DYN_CONFIG_PROTO(WINBINDD_PRIVILEGED_SOCKET_DIR)
     59DEFINE_DYN_CONFIG_PROTO(NTP_SIGND_SOCKET_DIR)
     60DEFINE_DYN_CONFIG_PROTO(PYTHONDIR)
     61DEFINE_DYN_CONFIG_PROTO(PYTHONARCHDIR)
     62DEFINE_DYN_CONFIG_PROTO(SCRIPTSBINDIR)
Note: See TracChangeset for help on using the changeset viewer.