X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/fabf5ea72dbd46c4050faaaf345ee99a98cc374e..4fd842f98df4970f6e49a0365dbed60774e56c09:/loadparm.c diff --git a/loadparm.c b/loadparm.c index f152e261..b14d09d4 100644 --- a/loadparm.c +++ b/loadparm.c @@ -1,21 +1,24 @@ /* This is based on loadparm.c from Samba, written by Andrew Tridgell and Karl Auer */ -/* - 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 program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 3 as + * published by the Free Software Foundation. + * + * 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, visit the http://fsf.org website. + */ + +/* some fixes + * + * Copyright (C) 2001, 2002 Martin Pool + */ /* * Load parameters. @@ -31,7 +34,7 @@ * 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 - * + * * * Notes: * The configuration file is processed sequentially for speed. It is NOT @@ -43,22 +46,24 @@ * */ +/* TODO: Parameter to set debug level on server. */ + #include "rsync.h" -#define BOOL int -#define False 0 -#define True 1 -#define Realloc realloc #define PTR_DIFF(p1,p2) ((ptrdiff_t)(((char *)(p1)) - (char *)(p2))) #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)-1) +#define pstrcpy(a,b) strlcpy(a,b,sizeof(pstring)) + +#ifndef LOG_DAEMON +#define LOG_DAEMON 0 +#endif /* the following are used by loadparm for option lists */ typedef enum { P_BOOL,P_BOOLREV,P_CHAR,P_INTEGER,P_OCTAL, - P_STRING,P_GSTRING,P_ENUM,P_SEP + P_PATH,P_STRING,P_GSTRING,P_ENUM,P_SEP } parm_type; typedef enum @@ -81,8 +86,6 @@ struct parm_struct unsigned flags; }; -static BOOL bLoaded = False; - #ifndef GLOBAL_NAME #define GLOBAL_NAME "global" #endif @@ -92,54 +95,116 @@ static BOOL bLoaded = False; #define iSERVICE(i) (*pSERVICE(i)) #define LP_SNUM_OK(iService) (((iService) >= 0) && ((iService) < iNumServices)) -/* +/* * This structure describes global (ie., server-wide) parameters. */ typedef struct { + char *bind_address; char *motd_file; - char *lock_file; - int syslog_facility; - int max_connections; + char *pid_file; + char *socket_options; + + int rsync_port; } global; static global Globals; - -/* - * This structure describes a single service. +/* + * This structure describes a single service. 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 { - char *name; - char *path; + char *auth_users; char *comment; - BOOL read_only; - BOOL list; - char *uid; + char *dont_compress; + char *exclude; + char *exclude_from; + char *filter; char *gid; char *hosts_allow; char *hosts_deny; - char *auth_users; + 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; + char *refuse_options; char *secrets_file; + char *temp_dir; + char *uid; + + int max_connections; + int max_verbosity; + int syslog_facility; + int timeout; + + BOOL fake_super; + BOOL ignore_errors; + BOOL ignore_nonreadable; + BOOL list; + BOOL read_only; + BOOL strict_modes; + BOOL transfer_logging; + BOOL use_chroot; + BOOL write_only; } service; -/* This is a default service used to prime a services structure */ -static service sDefault = +/* 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 + * above, use the variable name in the leading comment, including a + * trailing ';' (to avoid a sorting problem with trailing digits). */ +static service sDefault = { - NULL, /* name */ - NULL, /* path */ - NULL, /* comment */ - True, /* read only */ - True, /* list */ - "nobody",/* uid */ - "nobody",/* gid */ - NULL, /* hosts allow */ - NULL, /* hosts deny */ - NULL, /* auth users */ - NULL, /* secrets file */ + /* auth_users; */ NULL, + /* comment; */ NULL, + /* dont_compress; */ "*.gz *.tgz *.zip *.z *.rpm *.deb *.iso *.bz2 *.tbz", + /* exclude; */ NULL, + /* exclude_from; */ NULL, + /* filter; */ NULL, + /* gid; */ NOBODY_GROUP, + /* hosts_allow; */ NULL, + /* 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, + /* refuse_options; */ NULL, + /* secrets_file; */ NULL, + /* temp_dir; */ NULL, + /* uid; */ NOBODY_USER, + + /* max_connections; */ 0, + /* max_verbosity; */ 1, + /* syslog_facility; */ LOG_DAEMON, + /* timeout; */ 0, + + /* fake_super; */ False, + /* ignore_errors; */ False, + /* ignore_nonreadable; */ False, + /* list; */ True, + /* read_only; */ True, + /* strict_modes; */ True, + /* transfer_logging; */ False, + /* use_chroot; */ True, + /* write_only; */ False, }; @@ -181,7 +246,7 @@ static struct enum_list enum_facilities[] = { { LOG_NEWS, "news" }, #endif #ifdef LOG_AUTH - { LOG_AUTH, "security" }, + { LOG_AUTH, "security" }, #endif #ifdef LOG_SYSLOG { LOG_SYSLOG, "syslog" }, @@ -222,38 +287,65 @@ static struct enum_list enum_facilities[] = { /* note that we do not initialise the defaults union - it is not allowed in ANSI C */ static struct parm_struct parm_table[] = { - {"max connections", P_INTEGER, P_GLOBAL, &Globals.max_connections,NULL, 0}, - {"motd file", P_STRING, P_GLOBAL, &Globals.motd_file, NULL, 0}, - {"lock file", P_STRING, P_GLOBAL, &Globals.lock_file, NULL, 0}, - {"syslog facility", P_ENUM, P_GLOBAL, &Globals.syslog_facility, enum_facilities,0}, - {"name", P_STRING, P_LOCAL, &sDefault.name, NULL, 0}, - {"comment", P_STRING, P_LOCAL, &sDefault.comment, NULL, 0}, - {"path", P_STRING, P_LOCAL, &sDefault.path, NULL, 0}, - {"read only", P_BOOL, P_LOCAL, &sDefault.read_only, NULL, 0}, - {"list", P_BOOL, P_LOCAL, &sDefault.list, NULL, 0}, - {"uid", P_STRING, P_LOCAL, &sDefault.uid, 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}, - {"auth users", P_STRING, P_LOCAL, &sDefault.auth_users, NULL, 0}, - {"secrets file", P_STRING, P_LOCAL, &sDefault.secrets_file,NULL, 0}, - {NULL, P_BOOL, P_NONE, NULL, NULL, 0} + {"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}, + + {"auth users", P_STRING, P_LOCAL, &sDefault.auth_users, 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}, + {"name", P_STRING, P_LOCAL, &sDefault.name, 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}, + {"pre-xfer exec", P_STRING, P_LOCAL, &sDefault.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}, + {NULL, P_BOOL, P_NONE, NULL, NULL,0} }; /*************************************************************************** -Initialise the global parameter structure. +* Initialise the global parameter structure. ***************************************************************************/ static void init_globals(void) { -#ifdef LOG_DAEMON - Globals.syslog_facility = LOG_DAEMON; -#endif - Globals.lock_file = "/var/run/rsyncd.lock"; + memset(&Globals, 0, sizeof Globals); } /*************************************************************************** -Initialise the sDefault parameter structure. +* Initialise the sDefault parameter structure. ***************************************************************************/ static void init_locals(void) { @@ -261,8 +353,8 @@ static void init_locals(void) /* - In this section all the functions that are used to access the - parameters from the rest of the program are defined + 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) \ @@ -284,56 +376,100 @@ static void init_locals(void) int fn_name(int i) {return(LP_SNUM_OK(i)? pSERVICE(i)->val : sDefault.val);} +FN_GLOBAL_STRING(lp_bind_address, &Globals.bind_address) FN_GLOBAL_STRING(lp_motd_file, &Globals.motd_file) -FN_GLOBAL_STRING(lp_lock_file, &Globals.lock_file) -FN_GLOBAL_INTEGER(lp_max_connections, &Globals.max_connections) -FN_GLOBAL_INTEGER(lp_syslog_facility, &Globals.syslog_facility) -FN_LOCAL_STRING(lp_name, name) +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_LOCAL_STRING(lp_auth_users, auth_users) FN_LOCAL_STRING(lp_comment, comment) -FN_LOCAL_STRING(lp_path, path) -FN_LOCAL_BOOL(lp_read_only, read_only) -FN_LOCAL_BOOL(lp_list, list) -FN_LOCAL_STRING(lp_uid, uid) +FN_LOCAL_STRING(lp_dont_compress, dont_compress) +FN_LOCAL_STRING(lp_exclude, exclude) +FN_LOCAL_STRING(lp_exclude_from, exclude_from) +FN_LOCAL_STRING(lp_filter, filter) FN_LOCAL_STRING(lp_gid, gid) FN_LOCAL_STRING(lp_hosts_allow, hosts_allow) FN_LOCAL_STRING(lp_hosts_deny, hosts_deny) -FN_LOCAL_STRING(lp_auth_users, auth_users) +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) +FN_LOCAL_STRING(lp_refuse_options, refuse_options) FN_LOCAL_STRING(lp_secrets_file, secrets_file) +FN_LOCAL_INTEGER(lp_syslog_facility, syslog_facility) +FN_LOCAL_STRING(lp_temp_dir, temp_dir) +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_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_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 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 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 +* initialise a service to the defaults ***************************************************************************/ static void init_service(service *pservice) { - bzero((char *)pservice,sizeof(service)); + memset((char *)pservice,0,sizeof(service)); copy_service(pservice,&sDefault); } -static void string_set(char **s, char *v) + +/** + * 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) { if (!v) { *s = NULL; return; } *s = strdup(v); - if (!*s) exit_cleanup(1); + if (!*s) + exit_cleanup(RERR_MALLOC); } /*************************************************************************** -add a new service to the services array initialising it with the given -service +* add a new service to the services array initialising it with the given +* service ***************************************************************************/ static int add_a_service(service *pservice, char *name) { @@ -344,7 +480,7 @@ static int add_a_service(service *pservice, char *name) tservice = *pservice; /* it might already exist */ - if (name) + if (name) { i = getservicebyname(name,NULL); if (i >= 0) @@ -353,9 +489,10 @@ static int add_a_service(service *pservice, char *name) i = iNumServices; - ServicePtrs = (service **)Realloc(ServicePtrs,sizeof(service *)*num_to_alloc); + ServicePtrs = realloc_array(ServicePtrs, service *, num_to_alloc); + if (ServicePtrs) - pSERVICE(iNumServices) = (service *)malloc(sizeof(service)); + pSERVICE(iNumServices) = new(service); if (!ServicePtrs || !pSERVICE(iNumServices)) return(-1); @@ -365,13 +502,13 @@ static int add_a_service(service *pservice, char *name) init_service(pSERVICE(i)); copy_service(pSERVICE(i),&tservice); if (name) - string_set(&iSERVICE(i).name,name); + string_set(&iSERVICE(i).name,name); return(i); } /*************************************************************************** -Do a case-insensitive, whitespace-ignoring string compare. +* Do a case-insensitive, whitespace-ignoring string compare. ***************************************************************************/ static int strwicmp(char *psz1, char *psz2) { @@ -389,11 +526,11 @@ static int strwicmp(char *psz1, char *psz2) /* sync the strings on first non-whitespace */ while (1) { - while (isspace(*psz1)) + while (isSpace(psz1)) psz1++; - while (isspace(*psz2)) + while (isSpace(psz2)) psz2++; - if (toupper(*psz1) != toupper(*psz2) || *psz1 == '\0' || *psz2 == '\0') + if (toUpper(psz1) != toUpper(psz2) || *psz1 == '\0' || *psz2 == '\0') break; psz1++; psz2++; @@ -402,8 +539,8 @@ static int strwicmp(char *psz1, char *psz2) } /*************************************************************************** -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) { @@ -412,19 +549,19 @@ static int map_parameter(char *parmname) if (*parmname == '-') return(-1); - for (iIndex = 0; parm_table[iIndex].label; 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); + rprintf(FERROR, "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) { @@ -450,14 +587,14 @@ static BOOL set_boolean(BOOL *pb, char *parmvalue) } /*************************************************************************** -Find a service by name. Otherwise works like get_service. +* Find a service by name. Otherwise works like get_service. ***************************************************************************/ static int getservicebyname(char *name, service *pserviceDest) { int iService; for (iService = iNumServices - 1; iService >= 0; iService--) - if (strwicmp(iSERVICE(iService).name, name) == 0) + if (strwicmp(iSERVICE(iService).name, name) == 0) { if (pserviceDest != NULL) copy_service(pserviceDest, pSERVICE(iService)); @@ -470,10 +607,9 @@ static int getservicebyname(char *name, service *pserviceDest) /*************************************************************************** -Copy a service structure to another - +* Copy a service structure to another ***************************************************************************/ -static void copy_service(service *pserviceDest, +static void copy_service(service *pserviceDest, service *pserviceSource) { int i; @@ -481,9 +617,9 @@ static void copy_service(service *pserviceDest, 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 = + void *src_ptr = ((char *)pserviceSource) + PTR_DIFF(def_ptr,&sDefault); - void *dest_ptr = + void *dest_ptr = ((char *)pserviceDest) + PTR_DIFF(def_ptr,&sDefault); switch (parm_table[i].type) @@ -503,6 +639,7 @@ static void copy_service(service *pserviceDest, *(char *)dest_ptr = *(char *)src_ptr; break; + case P_PATH: case P_STRING: string_set(dest_ptr,*(char **)src_ptr); break; @@ -515,20 +652,21 @@ static void copy_service(service *pserviceDest, /*************************************************************************** -Process a parameter for a particular service number. If snum < 0 -then assume we are in the globals +* 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) { 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); + rprintf(FERROR, "IGNORING unknown parameter \"%s\"\n", parmname); return(True); } @@ -569,12 +707,21 @@ static BOOL lp_do_parameter(int snum, char *parmname, char *parmvalue) 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: - strcpy((char *)parm_ptr,parmvalue); + strlcpy((char *)parm_ptr,parmvalue,sizeof(pstring)); break; case P_ENUM: @@ -585,7 +732,8 @@ static BOOL lp_do_parameter(int snum, char *parmname, char *parmvalue) } } if (!parm_table[parmnum].enum_list[i].name) { - *(int *)parm_ptr = atoi(parmvalue); + if (atoi(parmvalue) > 0) + *(int *)parm_ptr = atoi(parmvalue); } break; case P_SEP: @@ -596,7 +744,7 @@ static BOOL lp_do_parameter(int snum, char *parmname, char *parmvalue) } /*************************************************************************** -Process a parameter. +* Process a parameter. ***************************************************************************/ static BOOL do_parameter(char *parmname, char *parmvalue) { @@ -604,9 +752,9 @@ static BOOL do_parameter(char *parmname, char *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 (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) { @@ -619,7 +767,7 @@ static BOOL do_section(char *sectionname) init_locals(); /* if we've just struck a global section, note the fact. */ - bInGlobalSection = isglobal; + bInGlobalSection = isglobal; /* check for multiple global sections */ if (bInGlobalSection) @@ -651,34 +799,39 @@ static BOOL do_section(char *sectionname) /*************************************************************************** -Load the services array from the services file. Return True on success, -False on failure. +* Load the services array from the services file. Return True on success, +* False on failure. ***************************************************************************/ -BOOL lp_load(char *pszFname) +BOOL lp_load(char *pszFname, int globals_only) { - pstring n2; - BOOL bRetval; - - bRetval = False; + extern int am_server; + extern int am_root; + pstring n2; + BOOL bRetval; + + bRetval = False; + + bInGlobalSection = True; - bInGlobalSection = True; - - init_globals(); + init_globals(); - pstrcpy(n2,pszFname); + if (pszFname) + pstrcpy(n2,pszFname); + else if (am_server && am_root <= 0) + pstrcpy(n2,RSYNCD_USERCONF); + else + pstrcpy(n2,RSYNCD_SYSCONF); - /* We get sections first, so have to start 'behind' to make up */ - iServiceIndex = -1; - bRetval = pm_process(n2, do_section, do_parameter); - - bLoaded = True; + /* 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); - return (bRetval); + return (bRetval); } /*************************************************************************** -return the max number of services +* return the max number of services ***************************************************************************/ int lp_numservices(void) { @@ -686,17 +839,17 @@ int lp_numservices(void) } /*************************************************************************** -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 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. ***************************************************************************/ int lp_number(char *name) { int iService; for (iService = iNumServices - 1; iService >= 0; iService--) - if (strequal(lp_name(iService), name)) + if (strcmp(lp_name(iService), name) == 0) break; return (iService);