X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/e0a18ce3f70e4420b4808ac24de6f6dfa86ee3b4..5dd14f0c3388f69932d521915e039e32b9e6d970:/loadparm.c diff --git a/loadparm.c b/loadparm.c index 12cec9a7..e2046125 100644 --- a/loadparm.c +++ b/loadparm.c @@ -1,72 +1,71 @@ -/* This is based on loadparm.c from Samba, written by Andrew Tridgell - and Karl Auer */ - -/* some fixes +/* + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. * - * Copyright (C) 2001, 2002 by Martin Pool + * You should have received a copy of the GNU General Public License along + * with this program; if not, visit the http://fsf.org website. */ -/* - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -*/ +/* This is based on loadparm.c from Samba, written by Andrew Tridgell + * and Karl Auer. Some of the changes are: + * + * Copyright (C) 2001, 2002 Martin Pool + * Copyright (C) 2003-2008 Wayne Davison + */ -/* - * Load parameters. +/* 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 or section 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) If it's a global then initialise it in init_globals. If a local module + * (ie. section) parameter then initialise it in the sDefault structure * * * 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" -#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" /* 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 { @@ -74,8 +73,7 @@ struct enum_list { char *name; }; -struct parm_struct -{ +struct parm_struct { char *label; parm_type type; parm_class class; @@ -89,36 +87,32 @@ 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) ((section*)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 *)&sDefault)) /* * This structure describes global (ie., server-wide) parameters. */ -typedef struct -{ +typedef struct { char *bind_address; - char *log_file; char *motd_file; char *pid_file; char *socket_options; int rsync_port; - int syslog_facility; } global; 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 -{ +typedef struct { char *auth_users; + char *charset; char *comment; char *dont_compress; char *exclude; @@ -129,9 +123,12 @@ typedef struct char *hosts_deny; char *include; char *include_from; + char *incoming_chmod; char *lock_file; + char *log_file; char *log_format; char *name; + char *outgoing_chmod; char *path; char *postxfer_exec; char *prexfer_exec; @@ -142,28 +139,36 @@ typedef struct int max_connections; int max_verbosity; + int syslog_facility; int timeout; + BOOL fake_super; BOOL ignore_errors; BOOL ignore_nonreadable; BOOL list; + BOOL munge_symlinks; + BOOL numeric_ids; BOOL read_only; BOOL strict_modes; BOOL transfer_logging; BOOL use_chroot; BOOL write_only; -} service; +} section; +typedef struct { + global g; + section s; +} global_and_section; -/* This is a default service used to prime a services structure. In order +/* This is a default section used to prime a sections structure. In order * to make these easy to keep sorted in the same way as the variables * above, use the variable name in the leading comment, including a * trailing ';' (to avoid a sorting problem with trailing digits). */ -static service sDefault = -{ +static section sDefault = { /* auth_users; */ NULL, - /* comment; */ NULL, - /* dont_compress; */ "*.gz *.tgz *.zip *.z *.rpm *.deb *.iso *.bz2 *.tbz", + /* charset; */ NULL, + /* comment; */ NULL, + /* dont_compress; */ DEFAULT_DONT_COMPRESS, /* exclude; */ NULL, /* exclude_from; */ NULL, /* filter; */ NULL, @@ -172,9 +177,12 @@ static service sDefault = /* hosts_deny; */ NULL, /* include; */ NULL, /* include_from; */ NULL, + /* incoming_chmod; */ NULL, /* lock_file; */ DEFAULT_LOCK_FILE, + /* log_file; */ NULL, /* log_format; */ "%o %h [%a] %m (%u) %f %l", /* name; */ NULL, + /* outgoing_chmod; */ NULL, /* path; */ NULL, /* postxfer_exec; */ NULL, /* prexfer_exec; */ NULL, @@ -185,11 +193,15 @@ static service sDefault = /* max_connections; */ 0, /* max_verbosity; */ 1, + /* syslog_facility; */ LOG_DAEMON, /* timeout; */ 0, + /* fake_super; */ False, /* ignore_errors; */ False, /* ignore_nonreadable; */ False, /* list; */ True, + /* munge_symlinks; */ (BOOL)-1, + /* numeric_ids; */ (BOOL)-1, /* read_only; */ True, /* strict_modes; */ True, /* transfer_logging; */ False, @@ -197,15 +209,13 @@ static service sDefault = /* write_only; */ False, }; - - /* local variables */ -static service **ServicePtrs = NULL; -static int iNumServices = 0; -static int iServiceIndex = 0; +static item_list section_list = EMPTY_ITEM_LIST; +static item_list section_stack = 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 @@ -271,25 +281,26 @@ 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}, - {"log file", P_STRING, P_GLOBAL,&Globals.log_file, 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}, - {"syslog facility", P_ENUM, P_GLOBAL,&Globals.syslog_facility,enum_facilities,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}, @@ -298,12 +309,17 @@ static struct parm_struct parm_table[] = {"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}, #ifdef HAVE_PUTENV {"post-xfer exec", P_STRING, P_LOCAL, &sDefault.postxfer_exec, NULL,0}, @@ -313,6 +329,7 @@ static struct parm_struct parm_table[] = {"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}, @@ -322,60 +339,48 @@ static struct parm_struct parm_table[] = {NULL, P_BOOL, P_NONE, NULL, NULL,0} }; - -/*************************************************************************** -Initialise the global parameter structure. -***************************************************************************/ +/* Initialise the global parameter structure. */ static void init_globals(void) { memset(&Globals, 0, sizeof Globals); -#ifdef LOG_DAEMON - Globals.syslog_facility = LOG_DAEMON; -#endif } -/*************************************************************************** -Initialise the sDefault parameter structure. -***************************************************************************/ +/* Initialise the sDefault parameter structure. */ static void init_locals(void) { + /* Nothing needed yet... */ } - -/* - 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(*(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((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);} - +/* 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 *(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 LP_SNUM_OK(i) && iSECTION(i).val? iSECTION(i).val : (sDefault.val? sDefault.val : "");} +#define FN_LOCAL_BOOL(fn_name, val) \ + BOOL fn_name(int i) {return LP_SNUM_OK(i)? iSECTION(i).val : sDefault.val;} +#define FN_LOCAL_CHAR(fn_name, val) \ + char fn_name(int i) {return LP_SNUM_OK(i)? iSECTION(i).val : sDefault.val;} +#define FN_LOCAL_INTEGER(fn_name, val) \ + int fn_name(int i) {return LP_SNUM_OK(i)? iSECTION(i).val : sDefault.val;} FN_GLOBAL_STRING(lp_bind_address, &Globals.bind_address) -FN_GLOBAL_STRING(lp_log_file, &Globals.log_file) 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) FN_GLOBAL_INTEGER(lp_rsync_port, &Globals.rsync_port) -FN_GLOBAL_INTEGER(lp_syslog_facility, &Globals.syslog_facility) FN_LOCAL_STRING(lp_auth_users, auth_users) +FN_LOCAL_STRING(lp_charset, charset) FN_LOCAL_STRING(lp_comment, comment) FN_LOCAL_STRING(lp_dont_compress, dont_compress) FN_LOCAL_STRING(lp_exclude, exclude) @@ -386,9 +391,12 @@ FN_LOCAL_STRING(lp_hosts_allow, hosts_allow) FN_LOCAL_STRING(lp_hosts_deny, hosts_deny) FN_LOCAL_STRING(lp_include, include) FN_LOCAL_STRING(lp_include_from, include_from) +FN_LOCAL_STRING(lp_incoming_chmod, incoming_chmod) FN_LOCAL_STRING(lp_lock_file, lock_file) +FN_LOCAL_STRING(lp_log_file, log_file) FN_LOCAL_STRING(lp_log_format, log_format) FN_LOCAL_STRING(lp_name, name) +FN_LOCAL_STRING(lp_outgoing_chmod, outgoing_chmod) FN_LOCAL_STRING(lp_path, path) FN_LOCAL_STRING(lp_postxfer_exec, postxfer_exec) FN_LOCAL_STRING(lp_prexfer_exec, prexfer_exec) @@ -399,449 +407,392 @@ FN_LOCAL_STRING(lp_uid, uid) FN_LOCAL_INTEGER(lp_max_connections, max_connections) FN_LOCAL_INTEGER(lp_max_verbosity, max_verbosity) +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_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_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) -{ - memset((char *)pservice,0,sizeof(service)); - copy_service(pservice,&sDefault); -} - - -/** - * Assign a copy of @p v to @p *s. Handles NULL strings. @p *v must +/* Assign a copy of v to *s. Handles NULL strings. *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 + * 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. - **/ + * memory. */ static void string_set(char **s, const char *v) { if (!v) { *s = NULL; return; } - *s = strdup(v); - if (!*s) + if (!(*s = strdup(v))) 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) +/* Copy a section structure to another. */ +static void copy_section(section *psectionDest, section *psectionSource) { - 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); - } + int i; + + 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 = SECTION_PTR(psectionSource, def_ptr); + void *dest_ptr = SECTION_PTR(psectionDest, def_ptr); + + switch (parm_table[i].type) { + case P_BOOL: + case P_BOOLREV: + *(BOOL *)dest_ptr = *(BOOL *)src_ptr; + break; + + case P_INTEGER: + case P_ENUM: + case P_OCTAL: + *(int *)dest_ptr = *(int *)src_ptr; + break; + + 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; + } + } + } +} - i = iNumServices; +/* Initialise a section to the defaults. */ +static void init_section(section *psection) +{ + memset((char *)psection, 0, sizeof (section)); + copy_section(psection, &sDefault); +} - ServicePtrs = realloc_array(ServicePtrs, service *, num_to_alloc); +/* 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; + + 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; +} - if (ServicePtrs) - pSERVICE(iNumServices) = new(service); +/* Find a section by name. Otherwise works like get_section. */ +static int getsectionbyname(char *name, section *psectionDest) +{ + int i; + + for (i = section_list.count - 1; i >= 0; i--) { + if (strwicmp(iSECTION(i).name, name) == 0) { + if (psectionDest != NULL) + copy_section(psectionDest, &iSECTION(i)); + break; + } + } - if (!ServicePtrs || !pSERVICE(iNumServices)) - return(-1); + return i; +} - iNumServices++; +/* Add a new section to the sections array w/the default values. */ +static int add_a_section(char *name) +{ + int i; + section *s; + + /* it might already exist */ + if (name) { + i = getsectionbyname(name, NULL); + if (i >= 0) + return i; + } - init_service(pSERVICE(i)); - copy_service(pSERVICE(i),&tservice); - if (name) - string_set(&iSERVICE(i).name,name); + i = section_list.count; + s = EXPAND_ITEM_LIST(§ion_list, section, 2); - return(i); -} + init_section(s); + if (name) + string_set(&s->name, name); -/*************************************************************************** -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); - - /* sync the strings on first non-whitespace */ - while (1) - { - while (isspace(* (unsigned char *) psz1)) - psz1++; - while (isspace(* (unsigned char *) psz2)) - psz2++; - if (toupper(* (unsigned char *) psz1) != toupper(* (unsigned char *) psz2) - || *psz1 == '\0' || *psz2 == '\0') - break; - psz1++; - psz2++; - } - return (*psz1 - *psz2); + return i; } -/*************************************************************************** -Map a parameter's string representation to something we can use. -Returns False if the parameter string is not recognised, else TRUE. -***************************************************************************/ +/* 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 iIndex; + int iIndex; - if (*parmname == '-') - return(-1); + if (*parmname == '-') + return -1; - for (iIndex = 0; parm_table[iIndex].label; iIndex++) - if (strwicmp(parm_table[iIndex].label, parmname) == 0) - return(iIndex); + for (iIndex = 0; parm_table[iIndex].label; iIndex++) { + if (strwicmp(parm_table[iIndex].label, parmname) == 0) + return iIndex; + } - rprintf(FERROR, "Unknown Parameter encountered: \"%s\"\n", parmname); - return(-1); + rprintf(FLOG, "Unknown Parameter encountered: \"%s\"\n", parmname); + return -1; } - -/*************************************************************************** -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. -***************************************************************************/ +/* 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) { - BOOL bRetval; - - 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(FERROR, "Badly formed boolean in configuration file: \"%s\".\n", - parmvalue); - bRetval = False; - } - return (bRetval); + 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; } -/*************************************************************************** -Find a service by name. Otherwise works like get_service. -***************************************************************************/ -static int getservicebyname(char *name, service *pserviceDest) +/* Process a parameter. */ +static BOOL do_parameter(char *parmname, char *parmvalue) { - int iService; + int parmnum, i; + void *parm_ptr; /* where we are going to store the result */ + void *def_ptr; + char *cp; - for (iService = iNumServices - 1; iService >= 0; iService--) - if (strwicmp(iSERVICE(iService).name, name) == 0) - { - if (pserviceDest != NULL) - copy_service(pserviceDest, pSERVICE(iService)); - break; - } + parmnum = map_parameter(parmname); - return (iService); -} + if (parmnum < 0) { + rprintf(FLOG, "IGNORING unknown parameter \"%s\"\n", parmname); + return True; + } + def_ptr = parm_table[parmnum].ptr; + 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); + } -/*************************************************************************** -Copy a service structure to another + /* now switch on the type of variable it is */ + switch (parm_table[parmnum].type) { + case P_BOOL: + set_boolean(parm_ptr, parmvalue); + break; + + case P_BOOLREV: + set_boolean(parm_ptr, parmvalue); + *(BOOL *)parm_ptr = ! *(BOOL *)parm_ptr; + break; + + case P_INTEGER: + *(int *)parm_ptr = atoi(parmvalue); + break; + + case P_CHAR: + *(char *)parm_ptr = *parmvalue; + break; + + case P_OCTAL: + sscanf(parmvalue, "%o", (int *)parm_ptr); + 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_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; + } -***************************************************************************/ -static void copy_service(service *pserviceDest, - service *pserviceSource) -{ - int i; - - 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); - - switch (parm_table[i].type) - { - case P_BOOL: - case P_BOOLREV: - *(BOOL *)dest_ptr = *(BOOL *)src_ptr; - break; - - case P_INTEGER: - case P_ENUM: - case P_OCTAL: - *(int *)dest_ptr = *(int *)src_ptr; - break; - - 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; - } - } + 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 new section (rsync module). + * Returns True on success, False on failure. */ +static BOOL do_section(char *sectionname) { - int parmnum, i; - void *parm_ptr=NULL; /* where we are going to store the result */ - void *def_ptr=NULL; - char *cp; - - parmnum = map_parameter(parmname); - - if (parmnum < 0) - { - rprintf(FERROR, "IGNORING unknown parameter \"%s\"\n", parmname); - return(True); - } - - 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(FERROR, "Global parameter %s found in service section!\n",parmname); - return(True); - } - parm_ptr = ((char *)pSERVICE(snum)) + PTR_DIFF(def_ptr,&sDefault); - } - - /* now switch on the type of variable it is */ - switch (parm_table[parmnum].type) - { - case P_BOOL: - set_boolean(parm_ptr,parmvalue); - break; - - case P_BOOLREV: - set_boolean(parm_ptr,parmvalue); - *(BOOL *)parm_ptr = ! *(BOOL *)parm_ptr; - break; - - case P_INTEGER: - *(int *)parm_ptr = atoi(parmvalue); - break; - - case P_CHAR: - *(char *)parm_ptr = *parmvalue; - break; - - case P_OCTAL: - sscanf(parmvalue,"%o",(int *)parm_ptr); - 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_STRING: - string_set(parm_ptr,parmvalue); - break; - - case P_GSTRING: - strlcpy((char *)parm_ptr,parmvalue,sizeof(pstring)); - 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; - } - - return(True); -} + BOOL isglobal; + + if (*sectionname == ']') { /* A special push/pop/reset directive from params.c */ + bInGlobalSection = 1; + if (strcmp(sectionname+1, "push") == 0) { + global_and_section *gs = EXPAND_ITEM_LIST(§ion_stack, global_and_section, 2); + memcpy(&gs->g, &Globals, sizeof Globals); + memcpy(&gs->s, &sDefault, sizeof sDefault); + } else if (strcmp(sectionname+1, "pop") == 0 + || strcmp(sectionname+1, "reset") == 0) { + global_and_section *gs = ((global_and_section *)section_stack.items) + section_stack.count - 1; + if (!section_stack.count) + return False; + memcpy(&Globals, &gs->g, sizeof Globals); + memcpy(&sDefault, &gs->s, sizeof sDefault); + if (sectionname[1] == 'p') + section_stack.count--; + } else + return False; + return True; + } -/*************************************************************************** -Process a parameter. -***************************************************************************/ -static BOOL do_parameter(char *parmname, char *parmvalue) -{ - return lp_do_parameter(bInGlobalSection?-2:iServiceIndex, parmname, parmvalue); -} + isglobal = strwicmp(sectionname, GLOBAL_NAME) == 0; -/*************************************************************************** -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. -***************************************************************************/ -static BOOL do_section(char *sectionname) -{ - BOOL bRetval; - BOOL isglobal = (strwicmp(sectionname, GLOBAL_NAME) == 0); - bRetval = False; - - /* if we were in a global section then do the local inits */ - if (bInGlobalSection && !isglobal) - init_locals(); - - /* if we've just struck a global section, note the fact. */ - bInGlobalSection = isglobal; - - /* check for multiple global sections */ - if (bInGlobalSection) - { - return(True); - } - - /* if we have a current service, tidy it up before moving on */ - bRetval = True; - - if (iServiceIndex >= 0) - bRetval = True; - - /* 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 ((iServiceIndex=add_a_service(&sDefault,sectionname)) < 0) - { - rprintf(FERROR,"Failed to add a new service\n"); - return(False); - } - } - - return (bRetval); -} + /* if we were in a global section then do the local inits */ + if (bInGlobalSection && !isglobal) { + if (!section_list.count) + set_dparams(0); + init_locals(); + } + /* if we've just struck a global section, note the fact. */ + bInGlobalSection = isglobal; -/*************************************************************************** -Load the services array from the services file. Return True on success, -False on failure. -***************************************************************************/ -BOOL lp_load(char *pszFname, int globals_only) -{ - extern int am_server; - extern int am_daemon; - extern int am_root; - pstring n2; - BOOL bRetval; + /* check for multiple global sections */ + if (bInGlobalSection) + return 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 - bRetval = False; + if (strchr(sectionname, '/') != NULL) { + rprintf(FLOG, "Warning: invalid section name in configuration file: %s\n", sectionname); + return False; + } + + if ((iSectionIndex = add_a_section(sectionname)) < 0) { + rprintf(FLOG, "Failed to add a new module\n"); + bInGlobalSection = True; + return False; + } + return True; +} + +/* Load the modules from the config file. Return True on success, + * False on failure. */ +int lp_load(char *pszFname, int globals_only) +{ bInGlobalSection = True; init_globals(); - if (pszFname) - pstrcpy(n2,pszFname); - else if (am_server && am_daemon && !am_root) - pstrcpy(n2,RSYNCD_USERCONF); - else - pstrcpy(n2,RSYNCD_SYSCONF); + /* 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; + + 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 (bRetval); + 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; } -