--- embedaddon/rsync/loadparm.c 2012/02/17 15:09:30 1.1 +++ embedaddon/rsync/loadparm.c 2013/10/14 07:51:14 1.1.1.2 @@ -17,61 +17,54 @@ * and Karl Auer. Some of the changes are: * * Copyright (C) 2001, 2002 Martin Pool - * Copyright (C) 2003-2009 Wayne Davison + * Copyright (C) 2003-2013 Wayne Davison */ /* Load parameters. * * This module provides suitable callback functions for the params - * module. It builds the internal table of service details which is + * module. It builds the internal table of section details which is * then used by the rest of the server. * * To add a parameter: * - * 1) add it to the global or service structure definition + * 1) add it to the global_vars or local_vars structure definition * 2) add it to the parm_table * 3) add it to the list of available functions (eg: using FN_GLOBAL_STRING()) - * 4) If it's a global then initialise it in init_globals. If a local - * (ie. service) parameter then initialise it in the sDefault structure + * 4) initialise it in the Defaults static stucture * - * * Notes: - * The configuration file is processed sequentially for speed. It is NOT - * accessed randomly as happens in 'real' Windows. For this reason, there - * is a fair bit of sequence-dependent code here - ie., code which assumes - * that certain things happen before others. In particular, the code which - * happens at the boundary between sections is delicately poised, so be - * careful! - * + * The configuration file is processed sequentially for speed. For this + * reason, there is a fair bit of sequence-dependent code here - ie., code + * which assumes that certain things happen before others. In particular, the + * code which happens at the boundary between sections is delicately poised, + * so be careful! */ -/* TODO: Parameter to set debug level on server. */ - #include "rsync.h" -#include "ifuncs.h" -#define PTR_DIFF(p1,p2) ((ptrdiff_t)(((char *)(p1)) - (char *)(p2))) -#define strequal(a,b) (strcasecmp(a,b)==0) +#include "itypes.h" + +extern item_list dparam_list; + +#define strequal(a, b) (strcasecmp(a, b)==0) #define BOOLSTR(b) ((b) ? "Yes" : "No") -typedef char pstring[1024]; -#define pstrcpy(a,b) strlcpy(a,b,sizeof(pstring)) #ifndef LOG_DAEMON #define LOG_DAEMON 0 #endif #define DEFAULT_DONT_COMPRESS "*.gz *.zip *.z *.rpm *.deb *.iso *.bz2" \ - " *.t[gb]z *.7z *.mp[34] *.mov *.avi *.ogg *.jpg *.jpeg" + " *.t[gb]z *.7z *.mp[34] *.mov *.avi *.ogg *.jpg *.jpeg *.png" \ + " *.lzo *.rzip *.lzma *.rar *.ace *.gpg *.xz *.txz *.lz *.tlz" /* the following are used by loadparm for option lists */ -typedef enum -{ - P_BOOL,P_BOOLREV,P_CHAR,P_INTEGER,P_OCTAL, - P_PATH,P_STRING,P_GSTRING,P_ENUM,P_SEP +typedef enum { + P_BOOL, P_BOOLREV, P_CHAR, P_INTEGER, + P_OCTAL, P_PATH, P_STRING, P_ENUM } parm_type; -typedef enum -{ - P_LOCAL,P_GLOBAL,P_SEPARATOR,P_NONE +typedef enum { + P_LOCAL, P_GLOBAL, P_NONE } parm_class; struct enum_list { @@ -79,8 +72,7 @@ struct enum_list { char *name; }; -struct parm_struct -{ +struct parm_struct { char *label; parm_type type; parm_class class; @@ -94,33 +86,26 @@ struct parm_struct #endif /* some helpful bits */ -#define pSERVICE(i) ServicePtrs[i] -#define iSERVICE(i) (*pSERVICE(i)) -#define LP_SNUM_OK(iService) (((iService) >= 0) && ((iService) < iNumServices)) +#define iSECTION(i) ((local_vars*)section_list.items)[i] +#define LP_SNUM_OK(i) ((i) >= 0 && (i) < (int)section_list.count) +#define SECTION_PTR(s, p) (((char*)(s)) + (ptrdiff_t)(((char*)(p))-(char*)&Vars.l)) -/* - * This structure describes global (ie., server-wide) parameters. - */ -typedef struct -{ +/* This structure describes global (ie., server-wide) parameters. */ +typedef struct { char *bind_address; char *motd_file; char *pid_file; char *socket_options; + int listen_backlog; int rsync_port; -} global; +} global_vars; -static global Globals; - - -/* - * This structure describes a single service. Their order must match the +/* This structure describes a single section. Their order must match the * initializers below, which you can accomplish by keeping each sub-section * sorted. (e.g. in vim, just visually select each subsection and use !sort.) - */ -typedef struct -{ + * NOTE: the char* variables MUST all remain at the start of the stuct! */ +typedef struct { char *auth_users; char *charset; char *comment; @@ -146,6 +131,8 @@ typedef struct char *secrets_file; char *temp_dir; char *uid; +/* NOTE: update this macro if the last char* variable changes! */ +#define LOCAL_STRING_COUNT() (offsetof(local_vars, uid) / sizeof (char*) + 1) int max_connections; int max_verbosity; @@ -153,25 +140,48 @@ typedef struct int timeout; BOOL fake_super; + BOOL forward_lookup; BOOL ignore_errors; BOOL ignore_nonreadable; BOOL list; BOOL munge_symlinks; BOOL numeric_ids; BOOL read_only; + BOOL reverse_lookup; BOOL strict_modes; BOOL transfer_logging; BOOL use_chroot; BOOL write_only; -} service; +} local_vars; +/* This structure describes the global variables (g) as well as the globally + * specified values of the local variables (l), which are used when modules + * don't specify their own values. */ +typedef struct { + global_vars g; + local_vars l; +} all_vars; -/* This is a default service used to prime a services structure. In order - * to make these easy to keep sorted in the same way as the variables +/* The application defaults for all the variables. "Defaults" is + * used to re-initialize "Vars" before each config-file read. + * + * In order to keep these sorted in the same way as the structure * above, use the variable name in the leading comment, including a * trailing ';' (to avoid a sorting problem with trailing digits). */ -static service sDefault = -{ +static const all_vars Defaults = { + /* ==== global_vars ==== */ + { + /* bind_address; */ NULL, + /* motd_file; */ NULL, + /* pid_file; */ NULL, + /* socket_options; */ NULL, + + /* listen_backlog; */ 5, + /* rsync_port; */ 0, + }, + + /* ==== local_vars ==== */ + { /* auth_users; */ NULL, /* charset; */ NULL, /* comment; */ NULL, @@ -179,7 +189,7 @@ static service sDefault = /* exclude; */ NULL, /* exclude_from; */ NULL, /* filter; */ NULL, - /* gid; */ NOBODY_GROUP, + /* gid; */ NULL, /* hosts_allow; */ NULL, /* hosts_deny; */ NULL, /* include; */ NULL, @@ -196,7 +206,7 @@ static service sDefault = /* refuse_options; */ NULL, /* secrets_file; */ NULL, /* temp_dir; */ NULL, - /* uid; */ NOBODY_USER, + /* uid; */ NULL, /* max_connections; */ 0, /* max_verbosity; */ 1, @@ -204,27 +214,34 @@ static service sDefault = /* timeout; */ 0, /* fake_super; */ False, + /* forward_lookup; */ True, /* ignore_errors; */ False, /* ignore_nonreadable; */ False, /* list; */ True, /* munge_symlinks; */ (BOOL)-1, /* numeric_ids; */ (BOOL)-1, /* read_only; */ True, + /* reverse_lookup; */ True, /* strict_modes; */ True, /* transfer_logging; */ False, /* use_chroot; */ True, /* write_only; */ False, + } }; +/* The currently configured values for all the variables. */ +static all_vars Vars; +/* Stack of "Vars" values used by the &include directive. */ +static item_list Vars_stack = EMPTY_ITEM_LIST; -/* local variables */ -static service **ServicePtrs = NULL; -static int iNumServices = 0; -static int iServiceIndex = 0; +/* The array of section values that holds all the defined modules. */ +static item_list section_list = EMPTY_ITEM_LIST; + +static int iSectionIndex = -1; static BOOL bInGlobalSection = True; -#define NUMPARAMETERS (sizeof(parm_table) / sizeof(struct parm_struct)) +#define NUMPARAMETERS (sizeof (parm_table) / sizeof (struct parm_struct)) static struct enum_list enum_facilities[] = { #ifdef LOG_AUTH @@ -290,111 +307,150 @@ static struct enum_list enum_facilities[] = { #ifdef LOG_LOCAL7 { LOG_LOCAL7, "local7" }, #endif - { -1, NULL }}; + { -1, NULL } +}; - -/* note that we do not initialise the defaults union - it is not allowed in ANSI C */ static struct parm_struct parm_table[] = { - {"address", P_STRING, P_GLOBAL,&Globals.bind_address, NULL,0}, - {"motd file", P_STRING, P_GLOBAL,&Globals.motd_file, NULL,0}, - {"pid file", P_STRING, P_GLOBAL,&Globals.pid_file, NULL,0}, - {"port", P_INTEGER,P_GLOBAL,&Globals.rsync_port, NULL,0}, - {"socket options", P_STRING, P_GLOBAL,&Globals.socket_options, NULL,0}, + {"address", P_STRING, P_GLOBAL,&Vars.g.bind_address, NULL,0}, + {"listen backlog", P_INTEGER,P_GLOBAL,&Vars.g.listen_backlog, NULL,0}, + {"motd file", P_STRING, P_GLOBAL,&Vars.g.motd_file, NULL,0}, + {"pid file", P_STRING, P_GLOBAL,&Vars.g.pid_file, NULL,0}, + {"port", P_INTEGER,P_GLOBAL,&Vars.g.rsync_port, NULL,0}, + {"socket options", P_STRING, P_GLOBAL,&Vars.g.socket_options, NULL,0}, - {"auth users", P_STRING, P_LOCAL, &sDefault.auth_users, NULL,0}, - {"charset", P_STRING, P_LOCAL, &sDefault.charset, NULL,0}, - {"comment", P_STRING, P_LOCAL, &sDefault.comment, NULL,0}, - {"dont compress", P_STRING, P_LOCAL, &sDefault.dont_compress, NULL,0}, - {"exclude from", P_STRING, P_LOCAL, &sDefault.exclude_from, NULL,0}, - {"exclude", P_STRING, P_LOCAL, &sDefault.exclude, NULL,0}, - {"fake super", P_BOOL, P_LOCAL, &sDefault.fake_super, NULL,0}, - {"filter", P_STRING, P_LOCAL, &sDefault.filter, NULL,0}, - {"gid", P_STRING, P_LOCAL, &sDefault.gid, NULL,0}, - {"hosts allow", P_STRING, P_LOCAL, &sDefault.hosts_allow, NULL,0}, - {"hosts deny", P_STRING, P_LOCAL, &sDefault.hosts_deny, NULL,0}, - {"ignore errors", P_BOOL, P_LOCAL, &sDefault.ignore_errors, NULL,0}, - {"ignore nonreadable",P_BOOL, P_LOCAL, &sDefault.ignore_nonreadable,NULL,0}, - {"include from", P_STRING, P_LOCAL, &sDefault.include_from, NULL,0}, - {"include", P_STRING, P_LOCAL, &sDefault.include, NULL,0}, - {"incoming chmod", P_STRING, P_LOCAL, &sDefault.incoming_chmod, NULL,0}, - {"list", P_BOOL, P_LOCAL, &sDefault.list, NULL,0}, - {"lock file", P_STRING, P_LOCAL, &sDefault.lock_file, NULL,0}, - {"log file", P_STRING, P_LOCAL, &sDefault.log_file, NULL,0}, - {"log format", P_STRING, P_LOCAL, &sDefault.log_format, NULL,0}, - {"max connections", P_INTEGER,P_LOCAL, &sDefault.max_connections, NULL,0}, - {"max verbosity", P_INTEGER,P_LOCAL, &sDefault.max_verbosity, NULL,0}, - {"munge symlinks", P_BOOL, P_LOCAL, &sDefault.munge_symlinks, NULL,0}, - {"name", P_STRING, P_LOCAL, &sDefault.name, NULL,0}, - {"numeric ids", P_BOOL, P_LOCAL, &sDefault.numeric_ids, NULL,0}, - {"outgoing chmod", P_STRING, P_LOCAL, &sDefault.outgoing_chmod, NULL,0}, - {"path", P_PATH, P_LOCAL, &sDefault.path, NULL,0}, + {"auth users", P_STRING, P_LOCAL, &Vars.l.auth_users, NULL,0}, + {"charset", P_STRING, P_LOCAL, &Vars.l.charset, NULL,0}, + {"comment", P_STRING, P_LOCAL, &Vars.l.comment, NULL,0}, + {"dont compress", P_STRING, P_LOCAL, &Vars.l.dont_compress, NULL,0}, + {"exclude from", P_STRING, P_LOCAL, &Vars.l.exclude_from, NULL,0}, + {"exclude", P_STRING, P_LOCAL, &Vars.l.exclude, NULL,0}, + {"fake super", P_BOOL, P_LOCAL, &Vars.l.fake_super, NULL,0}, + {"filter", P_STRING, P_LOCAL, &Vars.l.filter, NULL,0}, + {"forward lookup", P_BOOL, P_LOCAL, &Vars.l.forward_lookup, NULL,0}, + {"gid", P_STRING, P_LOCAL, &Vars.l.gid, NULL,0}, + {"hosts allow", P_STRING, P_LOCAL, &Vars.l.hosts_allow, NULL,0}, + {"hosts deny", P_STRING, P_LOCAL, &Vars.l.hosts_deny, NULL,0}, + {"ignore errors", P_BOOL, P_LOCAL, &Vars.l.ignore_errors, NULL,0}, + {"ignore nonreadable",P_BOOL, P_LOCAL, &Vars.l.ignore_nonreadable, NULL,0}, + {"include from", P_STRING, P_LOCAL, &Vars.l.include_from, NULL,0}, + {"include", P_STRING, P_LOCAL, &Vars.l.include, NULL,0}, + {"incoming chmod", P_STRING, P_LOCAL, &Vars.l.incoming_chmod, NULL,0}, + {"list", P_BOOL, P_LOCAL, &Vars.l.list, NULL,0}, + {"lock file", P_STRING, P_LOCAL, &Vars.l.lock_file, NULL,0}, + {"log file", P_STRING, P_LOCAL, &Vars.l.log_file, NULL,0}, + {"log format", P_STRING, P_LOCAL, &Vars.l.log_format, NULL,0}, + {"max connections", P_INTEGER,P_LOCAL, &Vars.l.max_connections, NULL,0}, + {"max verbosity", P_INTEGER,P_LOCAL, &Vars.l.max_verbosity, NULL,0}, + {"munge symlinks", P_BOOL, P_LOCAL, &Vars.l.munge_symlinks, NULL,0}, + {"name", P_STRING, P_LOCAL, &Vars.l.name, NULL,0}, + {"numeric ids", P_BOOL, P_LOCAL, &Vars.l.numeric_ids, NULL,0}, + {"outgoing chmod", P_STRING, P_LOCAL, &Vars.l.outgoing_chmod, NULL,0}, + {"path", P_PATH, P_LOCAL, &Vars.l.path, NULL,0}, #ifdef HAVE_PUTENV - {"post-xfer exec", P_STRING, P_LOCAL, &sDefault.postxfer_exec, NULL,0}, - {"pre-xfer exec", P_STRING, P_LOCAL, &sDefault.prexfer_exec, NULL,0}, + {"post-xfer exec", P_STRING, P_LOCAL, &Vars.l.postxfer_exec, NULL,0}, + {"pre-xfer exec", P_STRING, P_LOCAL, &Vars.l.prexfer_exec, NULL,0}, #endif - {"read only", P_BOOL, P_LOCAL, &sDefault.read_only, NULL,0}, - {"refuse options", P_STRING, P_LOCAL, &sDefault.refuse_options, NULL,0}, - {"secrets file", P_STRING, P_LOCAL, &sDefault.secrets_file, NULL,0}, - {"strict modes", P_BOOL, P_LOCAL, &sDefault.strict_modes, NULL,0}, - {"syslog facility", P_ENUM, P_LOCAL, &sDefault.syslog_facility,enum_facilities,0}, - {"temp dir", P_PATH, P_LOCAL, &sDefault.temp_dir, NULL,0}, - {"timeout", P_INTEGER,P_LOCAL, &sDefault.timeout, NULL,0}, - {"transfer logging", P_BOOL, P_LOCAL, &sDefault.transfer_logging, NULL,0}, - {"uid", P_STRING, P_LOCAL, &sDefault.uid, NULL,0}, - {"use chroot", P_BOOL, P_LOCAL, &sDefault.use_chroot, NULL,0}, - {"write only", P_BOOL, P_LOCAL, &sDefault.write_only, NULL,0}, + {"read only", P_BOOL, P_LOCAL, &Vars.l.read_only, NULL,0}, + {"refuse options", P_STRING, P_LOCAL, &Vars.l.refuse_options, NULL,0}, + {"reverse lookup", P_BOOL, P_LOCAL, &Vars.l.reverse_lookup, NULL,0}, + {"secrets file", P_STRING, P_LOCAL, &Vars.l.secrets_file, NULL,0}, + {"strict modes", P_BOOL, P_LOCAL, &Vars.l.strict_modes, NULL,0}, + {"syslog facility", P_ENUM, P_LOCAL, &Vars.l.syslog_facility, enum_facilities,0}, + {"temp dir", P_PATH, P_LOCAL, &Vars.l.temp_dir, NULL,0}, + {"timeout", P_INTEGER,P_LOCAL, &Vars.l.timeout, NULL,0}, + {"transfer logging", P_BOOL, P_LOCAL, &Vars.l.transfer_logging, NULL,0}, + {"uid", P_STRING, P_LOCAL, &Vars.l.uid, NULL,0}, + {"use chroot", P_BOOL, P_LOCAL, &Vars.l.use_chroot, NULL,0}, + {"write only", P_BOOL, P_LOCAL, &Vars.l.write_only, NULL,0}, {NULL, P_BOOL, P_NONE, NULL, NULL,0} }; - -/*************************************************************************** -* Initialise the global parameter structure. -***************************************************************************/ -static void init_globals(void) +/* Initialise the Default all_vars structure. */ +static void reset_all_vars(void) { - memset(&Globals, 0, sizeof Globals); + memcpy(&Vars, &Defaults, sizeof Vars); } -/*************************************************************************** -* Initialise the sDefault parameter structure. -***************************************************************************/ -static void init_locals(void) +/* Expand %VAR% references. Any unknown vars or unrecognized + * syntax leaves the raw chars unchanged. */ +static char *expand_vars(char *str) { -} + char *buf, *t, *f; + int bufsize; + if (strchr(str, '%') == NULL) + return str; -/* - In this section all the functions that are used to access the - parameters from the rest of the program are defined -*/ + bufsize = strlen(str) + 2048; + if ((buf = new_array(char, bufsize+1)) == NULL) /* +1 for trailing '\0' */ + out_of_memory("expand_vars"); -#define FN_GLOBAL_STRING(fn_name,ptr) \ - char *fn_name(void) {return(*(char **)(ptr) ? *(char **)(ptr) : "");} -#define FN_GLOBAL_BOOL(fn_name,ptr) \ - BOOL fn_name(void) {return(*(BOOL *)(ptr));} -#define FN_GLOBAL_CHAR(fn_name,ptr) \ - char fn_name(void) {return(*(char *)(ptr));} -#define FN_GLOBAL_INTEGER(fn_name,ptr) \ - int fn_name(void) {return(*(int *)(ptr));} + for (t = buf, f = str; bufsize && *f; ) { + if (*f == '%' && *++f != '%') { + char *percent = strchr(f, '%'); + if (percent) { + char *val; + *percent = '\0'; + val = getenv(f); + *percent = '%'; + if (val) { + int len = strlcpy(t, val, bufsize+1); + if (len > bufsize) + break; + bufsize -= len; + t += len; + f = percent + 1; + continue; + } + } + f--; + } + *t++ = *f++; + bufsize--; + } + *t = '\0'; -#define FN_LOCAL_STRING(fn_name,val) \ - char *fn_name(int i) {return((LP_SNUM_OK(i)&&pSERVICE(i)->val)?pSERVICE(i)->val : (sDefault.val?sDefault.val:""));} -#define FN_LOCAL_BOOL(fn_name,val) \ - BOOL fn_name(int i) {return(LP_SNUM_OK(i)? pSERVICE(i)->val : sDefault.val);} -#define FN_LOCAL_CHAR(fn_name,val) \ - char fn_name(int i) {return(LP_SNUM_OK(i)? pSERVICE(i)->val : sDefault.val);} -#define FN_LOCAL_INTEGER(fn_name,val) \ - int fn_name(int i) {return(LP_SNUM_OK(i)? pSERVICE(i)->val : sDefault.val);} + if (*f) { + rprintf(FLOG, "Overflowed buf in expand_vars() trying to expand: %s\n", str); + exit_cleanup(RERR_MALLOC); + } + if (bufsize && (buf = realloc(buf, t - buf + 1)) == NULL) + out_of_memory("expand_vars"); -FN_GLOBAL_STRING(lp_bind_address, &Globals.bind_address) -FN_GLOBAL_STRING(lp_motd_file, &Globals.motd_file) -FN_GLOBAL_STRING(lp_pid_file, &Globals.pid_file) -FN_GLOBAL_STRING(lp_socket_options, &Globals.socket_options) + return buf; +} -FN_GLOBAL_INTEGER(lp_rsync_port, &Globals.rsync_port) +/* In this section all the functions that are used to access the + * parameters from the rest of the program are defined. */ +#define FN_GLOBAL_STRING(fn_name, ptr) \ + char *fn_name(void) {return expand_vars(*(char **)(ptr) ? *(char **)(ptr) : "");} +#define FN_GLOBAL_BOOL(fn_name, ptr) \ + BOOL fn_name(void) {return *(BOOL *)(ptr);} +#define FN_GLOBAL_CHAR(fn_name, ptr) \ + char fn_name(void) {return *(char *)(ptr);} +#define FN_GLOBAL_INTEGER(fn_name, ptr) \ + int fn_name(void) {return *(int *)(ptr);} + +#define FN_LOCAL_STRING(fn_name, val) \ + char *fn_name(int i) {return expand_vars(LP_SNUM_OK(i) && iSECTION(i).val ? iSECTION(i).val : Vars.l.val ? Vars.l.val : "");} +#define FN_LOCAL_BOOL(fn_name, val) \ + BOOL fn_name(int i) {return LP_SNUM_OK(i)? iSECTION(i).val : Vars.l.val;} +#define FN_LOCAL_CHAR(fn_name, val) \ + char fn_name(int i) {return LP_SNUM_OK(i)? iSECTION(i).val : Vars.l.val;} +#define FN_LOCAL_INTEGER(fn_name, val) \ + int fn_name(int i) {return LP_SNUM_OK(i)? iSECTION(i).val : Vars.l.val;} + +FN_GLOBAL_STRING(lp_bind_address, &Vars.g.bind_address) +FN_GLOBAL_STRING(lp_motd_file, &Vars.g.motd_file) +FN_GLOBAL_STRING(lp_pid_file, &Vars.g.pid_file) +FN_GLOBAL_STRING(lp_socket_options, &Vars.g.socket_options) + +FN_GLOBAL_INTEGER(lp_listen_backlog, &Vars.g.listen_backlog) +FN_GLOBAL_INTEGER(lp_rsync_port, &Vars.g.rsync_port) + FN_LOCAL_STRING(lp_auth_users, auth_users) FN_LOCAL_STRING(lp_charset, charset) FN_LOCAL_STRING(lp_comment, comment) @@ -427,444 +483,364 @@ FN_LOCAL_INTEGER(lp_syslog_facility, syslog_facility) FN_LOCAL_INTEGER(lp_timeout, timeout) FN_LOCAL_BOOL(lp_fake_super, fake_super) +FN_LOCAL_BOOL(lp_forward_lookup, forward_lookup) FN_LOCAL_BOOL(lp_ignore_errors, ignore_errors) FN_LOCAL_BOOL(lp_ignore_nonreadable, ignore_nonreadable) FN_LOCAL_BOOL(lp_list, list) FN_LOCAL_BOOL(lp_munge_symlinks, munge_symlinks) FN_LOCAL_BOOL(lp_numeric_ids, numeric_ids) FN_LOCAL_BOOL(lp_read_only, read_only) +FN_LOCAL_BOOL(lp_reverse_lookup, reverse_lookup) FN_LOCAL_BOOL(lp_strict_modes, strict_modes) FN_LOCAL_BOOL(lp_transfer_logging, transfer_logging) FN_LOCAL_BOOL(lp_use_chroot, use_chroot) FN_LOCAL_BOOL(lp_write_only, write_only) -/* local prototypes */ -static int strwicmp(char *psz1, char *psz2); -static int map_parameter(char *parmname); -static BOOL set_boolean(BOOL *pb, char *parmvalue); -static int getservicebyname(char *name, service *pserviceDest); -static void copy_service(service *pserviceDest, service *pserviceSource); -static BOOL do_parameter(char *parmname, char *parmvalue); -static BOOL do_section(char *sectionname); - - -/*************************************************************************** -* initialise a service to the defaults -***************************************************************************/ -static void init_service(service *pservice) +/* Assign a copy of v to *s. Handles NULL strings. We don't worry + * about overwriting a malloc'd string because the long-running + * (port-listening) daemon only loads the config file once, and the + * per-job (forked or xinitd-ran) daemon only re-reads the file at + * the start, so any lost memory is inconsequential. */ +static inline void string_set(char **s, const char *v) { - memset((char *)pservice,0,sizeof(service)); - copy_service(pservice,&sDefault); + if (!v) + *s = NULL; + else if (!(*s = strdup(v))) + out_of_memory("string_set"); } - -/** - * Assign a copy of @p v to @p *s. Handles NULL strings. @p *v must - * be initialized when this is called, either to NULL or a malloc'd - * string. - * - * @fixme There is a small leak here in that sometimes the existing - * value will be dynamically allocated, and the old copy is lost. - * However, we can't always deallocate the old value, because in the - * case of sDefault, it points to a static string. It would be nice - * to have either all-strdup'd values, or to never need to free - * memory. - **/ -static void string_set(char **s, const char *v) +/* Copy the local_vars, strdup'ing any strings. NOTE: this depends on + * the structure starting with a contiguous list of the char* variables, + * and having an accurate count in the LOCAL_STRING_COUNT() macro. */ +static void copy_section(local_vars *psectionDest, local_vars *psectionSource) { - if (!v) { - *s = NULL; - return; + int count = LOCAL_STRING_COUNT(); + char **strings = (char**)psectionDest; + + memcpy(psectionDest, psectionSource, sizeof psectionDest[0]); + while (count--) { + if (strings[count] && !(strings[count] = strdup(strings[count]))) + out_of_memory("copy_section"); } - *s = strdup(v); - if (!*s) - exit_cleanup(RERR_MALLOC); } - -/*************************************************************************** -* add a new service to the services array initialising it with the given -* service -***************************************************************************/ -static int add_a_service(service *pservice, char *name) +/* Initialise a section to the defaults. */ +static void init_section(local_vars *psection) { - int i; - service tservice; - int num_to_alloc = iNumServices+1; - - tservice = *pservice; - - /* it might already exist */ - if (name) - { - i = getservicebyname(name,NULL); - if (i >= 0) - return(i); - } - - i = iNumServices; - - ServicePtrs = realloc_array(ServicePtrs, service *, num_to_alloc); - - if (ServicePtrs) - pSERVICE(iNumServices) = new(service); - - if (!ServicePtrs || !pSERVICE(iNumServices)) - return(-1); - - iNumServices++; - - init_service(pSERVICE(i)); - copy_service(pSERVICE(i),&tservice); - if (name) - string_set(&iSERVICE(i).name,name); - - return(i); + memset(psection, 0, sizeof (local_vars)); + copy_section(psection, &Vars.l); } -/*************************************************************************** -* Do a case-insensitive, whitespace-ignoring string compare. -***************************************************************************/ +/* Do a case-insensitive, whitespace-ignoring string compare. */ static int strwicmp(char *psz1, char *psz2) { - /* if BOTH strings are NULL, return TRUE, if ONE is NULL return */ - /* appropriate value. */ - if (psz1 == psz2) - return (0); - else - if (psz1 == NULL) - return (-1); - else - if (psz2 == NULL) - return (1); + /* if BOTH strings are NULL, return TRUE, if ONE is NULL return */ + /* appropriate value. */ + if (psz1 == psz2) + return 0; - /* sync the strings on first non-whitespace */ - while (1) - { - while (isSpace(psz1)) - psz1++; - while (isSpace(psz2)) - psz2++; - if (toUpper(psz1) != toUpper(psz2) || *psz1 == '\0' || *psz2 == '\0') - break; - psz1++; - psz2++; - } - return (*psz1 - *psz2); + if (psz1 == NULL) + return -1; + + if (psz2 == NULL) + return 1; + + /* sync the strings on first non-whitespace */ + while (1) { + while (isSpace(psz1)) + psz1++; + while (isSpace(psz2)) + psz2++; + if (toUpper(psz1) != toUpper(psz2) || *psz1 == '\0' || *psz2 == '\0') + break; + psz1++; + psz2++; + } + return *psz1 - *psz2; } -/*************************************************************************** -* Map a parameter's string representation to something we can use. -* Returns False if the parameter string is not recognised, else TRUE. -***************************************************************************/ -static int map_parameter(char *parmname) +/* Find a section by name. Otherwise works like get_section. */ +static int getsectionbyname(char *name) { - int iIndex; + int i; - if (*parmname == '-') - return(-1); + for (i = section_list.count - 1; i >= 0; i--) { + if (strwicmp(iSECTION(i).name, name) == 0) + break; + } - for (iIndex = 0; parm_table[iIndex].label; iIndex++) - if (strwicmp(parm_table[iIndex].label, parmname) == 0) - return(iIndex); - - rprintf(FLOG, "Unknown Parameter encountered: \"%s\"\n", parmname); - return(-1); + return i; } - -/*************************************************************************** -* Set a boolean variable from the text value stored in the passed string. -* Returns True in success, False if the passed string does not correctly -* represent a boolean. -***************************************************************************/ -static BOOL set_boolean(BOOL *pb, char *parmvalue) +/* Add a new section to the sections array w/the default values. */ +static int add_a_section(char *name) { - BOOL bRetval; + int i; + local_vars *s; - bRetval = True; - if (strwicmp(parmvalue, "yes") == 0 || - strwicmp(parmvalue, "true") == 0 || - strwicmp(parmvalue, "1") == 0) - *pb = True; - else - if (strwicmp(parmvalue, "no") == 0 || - strwicmp(parmvalue, "False") == 0 || - strwicmp(parmvalue, "0") == 0) - *pb = False; - else - { - rprintf(FLOG, "Badly formed boolean in configuration file: \"%s\".\n", - parmvalue); - bRetval = False; - } - return (bRetval); -} + /* it might already exist */ + if (name) { + i = getsectionbyname(name); + if (i >= 0) + return i; + } -/*************************************************************************** -* Find a service by name. Otherwise works like get_service. -***************************************************************************/ -static int getservicebyname(char *name, service *pserviceDest) -{ - int iService; + i = section_list.count; + s = EXPAND_ITEM_LIST(§ion_list, local_vars, 2); - for (iService = iNumServices - 1; iService >= 0; iService--) - if (strwicmp(iSERVICE(iService).name, name) == 0) - { - if (pserviceDest != NULL) - copy_service(pserviceDest, pSERVICE(iService)); - break; - } + init_section(s); + if (name) + string_set(&s->name, name); - return (iService); + return i; } - - -/*************************************************************************** -* Copy a service structure to another -***************************************************************************/ -static void copy_service(service *pserviceDest, - service *pserviceSource) +/* Map a parameter's string representation to something we can use. + * Returns False if the parameter string is not recognised, else TRUE. */ +static int map_parameter(char *parmname) { - int i; + int iIndex; - for (i=0;parm_table[i].label;i++) - if (parm_table[i].ptr && parm_table[i].class == P_LOCAL) { - void *def_ptr = parm_table[i].ptr; - void *src_ptr = - ((char *)pserviceSource) + PTR_DIFF(def_ptr,&sDefault); - void *dest_ptr = - ((char *)pserviceDest) + PTR_DIFF(def_ptr,&sDefault); + if (*parmname == '-') + return -1; - switch (parm_table[i].type) - { - case P_BOOL: - case P_BOOLREV: - *(BOOL *)dest_ptr = *(BOOL *)src_ptr; - break; + for (iIndex = 0; parm_table[iIndex].label; iIndex++) { + if (strwicmp(parm_table[iIndex].label, parmname) == 0) + return iIndex; + } - case P_INTEGER: - case P_ENUM: - case P_OCTAL: - *(int *)dest_ptr = *(int *)src_ptr; - break; + rprintf(FLOG, "Unknown Parameter encountered: \"%s\"\n", parmname); + return -1; +} - case P_CHAR: - *(char *)dest_ptr = *(char *)src_ptr; - break; - - case P_PATH: - case P_STRING: - string_set(dest_ptr,*(char **)src_ptr); - break; - - default: - break; - } - } +/* Set a boolean variable from the text value stored in the passed string. + * Returns True in success, False if the passed string does not correctly + * represent a boolean. */ +static BOOL set_boolean(BOOL *pb, char *parmvalue) +{ + if (strwicmp(parmvalue, "yes") == 0 + || strwicmp(parmvalue, "true") == 0 + || strwicmp(parmvalue, "1") == 0) + *pb = True; + else if (strwicmp(parmvalue, "no") == 0 + || strwicmp(parmvalue, "False") == 0 + || strwicmp(parmvalue, "0") == 0) + *pb = False; + else { + rprintf(FLOG, "Badly formed boolean in configuration file: \"%s\".\n", parmvalue); + return False; + } + return True; } - -/*************************************************************************** -* Process a parameter for a particular service number. If snum < 0 -* then assume we are in the globals -***************************************************************************/ -static BOOL lp_do_parameter(int snum, char *parmname, char *parmvalue) +/* Process a parameter. */ +static BOOL do_parameter(char *parmname, char *parmvalue) { - int parmnum, i; - void *parm_ptr=NULL; /* where we are going to store the result */ - void *def_ptr=NULL; - char *cp; + int parmnum, i; + void *parm_ptr; /* where we are going to store the result */ + void *def_ptr; + char *cp; - parmnum = map_parameter(parmname); + parmnum = map_parameter(parmname); - if (parmnum < 0) - { - rprintf(FLOG, "IGNORING unknown parameter \"%s\"\n", parmname); - return(True); - } + if (parmnum < 0) { + rprintf(FLOG, "IGNORING unknown parameter \"%s\"\n", parmname); + return True; + } - def_ptr = parm_table[parmnum].ptr; + def_ptr = parm_table[parmnum].ptr; - /* we might point at a service, the default service or a global */ - if (snum < 0) { - parm_ptr = def_ptr; - } else { - if (parm_table[parmnum].class == P_GLOBAL) { - rprintf(FLOG, "Global parameter %s found in service section!\n",parmname); - return(True); - } - parm_ptr = ((char *)pSERVICE(snum)) + PTR_DIFF(def_ptr,&sDefault); - } + if (bInGlobalSection) + parm_ptr = def_ptr; + else { + if (parm_table[parmnum].class == P_GLOBAL) { + rprintf(FLOG, "Global parameter %s found in module section!\n", parmname); + return True; + } + parm_ptr = SECTION_PTR(&iSECTION(iSectionIndex), def_ptr); + } - /* now switch on the type of variable it is */ - switch (parm_table[parmnum].type) - { - case P_BOOL: - set_boolean(parm_ptr,parmvalue); - break; + /* now switch on the type of variable it is */ + switch (parm_table[parmnum].type) { + case P_PATH: + case P_STRING: + /* delay expansion of vars */ + break; + default: + /* expand any %VARS% now */ + parmvalue = expand_vars(parmvalue); + break; + } - case P_BOOLREV: - set_boolean(parm_ptr,parmvalue); - *(BOOL *)parm_ptr = ! *(BOOL *)parm_ptr; - break; + switch (parm_table[parmnum].type) { + case P_BOOL: + set_boolean(parm_ptr, parmvalue); + break; - case P_INTEGER: - *(int *)parm_ptr = atoi(parmvalue); - break; + case P_BOOLREV: + set_boolean(parm_ptr, parmvalue); + *(BOOL *)parm_ptr = ! *(BOOL *)parm_ptr; + break; - case P_CHAR: - *(char *)parm_ptr = *parmvalue; - break; + case P_INTEGER: + *(int *)parm_ptr = atoi(parmvalue); + break; - case P_OCTAL: - sscanf(parmvalue,"%o",(int *)parm_ptr); - break; + case P_CHAR: + *(char *)parm_ptr = *parmvalue; + break; - case P_PATH: - string_set(parm_ptr,parmvalue); - if ((cp = *(char**)parm_ptr) != NULL) { - int len = strlen(cp); - while (len > 1 && cp[len-1] == '/') len--; - cp[len] = '\0'; - } - break; + case P_OCTAL: + sscanf(parmvalue, "%o", (int *)parm_ptr); + break; - case P_STRING: - string_set(parm_ptr,parmvalue); - break; + case P_PATH: + string_set(parm_ptr, parmvalue); + if ((cp = *(char**)parm_ptr) != NULL) { + int len = strlen(cp); + while (len > 1 && cp[len-1] == '/') len--; + cp[len] = '\0'; + } + break; - case P_GSTRING: - strlcpy((char *)parm_ptr,parmvalue,sizeof(pstring)); - break; + case P_STRING: + string_set(parm_ptr, parmvalue); + break; - case P_ENUM: - for (i=0;parm_table[parmnum].enum_list[i].name;i++) { - if (strequal(parmvalue, parm_table[parmnum].enum_list[i].name)) { - *(int *)parm_ptr = parm_table[parmnum].enum_list[i].value; - break; - } - } - if (!parm_table[parmnum].enum_list[i].name) { - if (atoi(parmvalue) > 0) - *(int *)parm_ptr = atoi(parmvalue); - } - break; - case P_SEP: - break; - } + case P_ENUM: + for (i=0; parm_table[parmnum].enum_list[i].name; i++) { + if (strequal(parmvalue, parm_table[parmnum].enum_list[i].name)) { + *(int *)parm_ptr = parm_table[parmnum].enum_list[i].value; + break; + } + } + if (!parm_table[parmnum].enum_list[i].name) { + if (atoi(parmvalue) > 0) + *(int *)parm_ptr = atoi(parmvalue); + } + break; + } - return(True); + return True; } -/*************************************************************************** -* Process a parameter. -***************************************************************************/ -static BOOL do_parameter(char *parmname, char *parmvalue) -{ - return lp_do_parameter(bInGlobalSection?-2:iServiceIndex, parmname, parmvalue); -} - -/*************************************************************************** -* Process a new section (service). At this stage all sections are services. -* Later we'll have special sections that permit server parameters to be set. -* Returns True on success, False on failure. -***************************************************************************/ +/* Process a new section (rsync module). + * Returns True on success, False on failure. */ static BOOL do_section(char *sectionname) { - BOOL bRetval; - BOOL isglobal = (strwicmp(sectionname, GLOBAL_NAME) == 0); - bRetval = False; + BOOL isglobal; - /* if we were in a global section then do the local inits */ - if (bInGlobalSection && !isglobal) - init_locals(); + if (*sectionname == ']') { /* A special push/pop/reset directive from params.c */ + bInGlobalSection = 1; + if (strcmp(sectionname+1, "push") == 0) { + all_vars *vp = EXPAND_ITEM_LIST(&Vars_stack, all_vars, 2); + memcpy(vp, &Vars, sizeof Vars); + } else if (strcmp(sectionname+1, "pop") == 0 + || strcmp(sectionname+1, "reset") == 0) { + all_vars *vp = ((all_vars*)Vars_stack.items) + Vars_stack.count - 1; + if (!Vars_stack.count) + return False; + memcpy(&Vars, vp, sizeof Vars); + if (sectionname[1] == 'p') + Vars_stack.count--; + } else + return False; + return True; + } - /* if we've just struck a global section, note the fact. */ - bInGlobalSection = isglobal; + isglobal = strwicmp(sectionname, GLOBAL_NAME) == 0; - /* check for multiple global sections */ - if (bInGlobalSection) - { - return(True); - } + /* At the end of the global section, add any --dparam items. */ + if (bInGlobalSection && !isglobal) { + if (!section_list.count) + set_dparams(0); + } - if (strchr(sectionname, '/') != NULL) { - rprintf(FLOG, "Warning: invalid section name in configuration file: %s\n", sectionname); - return False; - } + /* if we've just struck a global section, note the fact. */ + bInGlobalSection = isglobal; - /* if we have a current service, tidy it up before moving on */ - bRetval = True; + /* check for multiple global sections */ + if (bInGlobalSection) + return True; - if (iServiceIndex >= 0) - bRetval = True; +#if 0 + /* If we have a current section, tidy it up before moving on. */ + if (iSectionIndex >= 0) { + /* Add any tidy work as needed ... */ + if (problem) + return False; + } +#endif - /* if all is still well, move to the next record in the services array */ - if (bRetval) - { - /* We put this here to avoid an odd message order if messages are */ - /* issued by the post-processing of a previous section. */ + if (strchr(sectionname, '/') != NULL) { + rprintf(FLOG, "Warning: invalid section name in configuration file: %s\n", sectionname); + return False; + } - if ((iServiceIndex=add_a_service(&sDefault,sectionname)) < 0) - { - rprintf(FLOG, "Failed to add a new service\n"); - return(False); - } - } + if ((iSectionIndex = add_a_section(sectionname)) < 0) { + rprintf(FLOG, "Failed to add a new module\n"); + bInGlobalSection = True; + return False; + } - return (bRetval); + return True; } - -/*************************************************************************** -* Load the services array from the services file. Return True on success, -* False on failure. -***************************************************************************/ -BOOL lp_load(char *pszFname, int globals_only) +/* Load the modules from the config file. Return True on success, + * False on failure. */ +int lp_load(char *pszFname, int globals_only) { - pstring n2; - BOOL bRetval; - - bRetval = False; - bInGlobalSection = True; - init_globals(); + reset_all_vars(); - pstrcpy(n2, pszFname); + /* We get sections first, so have to start 'behind' to make up. */ + iSectionIndex = -1; + return pm_process(pszFname, globals_only ? NULL : do_section, do_parameter); +} - /* We get sections first, so have to start 'behind' to make up */ - iServiceIndex = -1; - bRetval = pm_process(n2, globals_only?NULL:do_section, do_parameter); +BOOL set_dparams(int syntax_check_only) +{ + char *equal, *val, **params = dparam_list.items; + unsigned j; - return (bRetval); + for (j = 0; j < dparam_list.count; j++) { + equal = strchr(params[j], '='); /* options.c verified this */ + *equal = '\0'; + if (syntax_check_only) { + if (map_parameter(params[j]) < 0) { + rprintf(FERROR, "Unknown parameter \"%s\"\n", params[j]); + *equal = '='; + return False; + } + } else { + for (val = equal+1; isSpace(val); val++) {} + do_parameter(params[j], val); + } + *equal = '='; + } + + return True; } - -/*************************************************************************** -* return the max number of services -***************************************************************************/ -int lp_numservices(void) +/* Return the max number of modules (sections). */ +int lp_num_modules(void) { - return(iNumServices); + return section_list.count; } -/*************************************************************************** -* Return the number of the service with the given name, or -1 if it doesn't -* exist. Note that this is a DIFFERENT ANIMAL from the internal function -* getservicebyname()! This works ONLY if all services have been loaded, and -* does not copy the found service. -***************************************************************************/ +/* Return the number of the module with the given name, or -1 if it doesn't + * exist. Note that this is a DIFFERENT ANIMAL from the internal function + * getsectionbyname()! This works ONLY if all sections have been loaded, + * and does not copy the found section. */ int lp_number(char *name) { - int iService; + int i; - for (iService = iNumServices - 1; iService >= 0; iService--) - if (strcmp(lp_name(iService), name) == 0) - break; + for (i = section_list.count - 1; i >= 0; i--) { + if (strcmp(lp_name(i), name) == 0) + break; + } - return (iService); + return i; } -