X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/1ed3f5ed619b61f86007413a6c2420ddd55176f7..9439c0cb5a4b020b9bfcfe0351e33c17b9c53b54:/loadparm.c diff --git a/loadparm.c b/loadparm.c index dc8ddbe7..be3dc63e 100644 --- a/loadparm.c +++ b/loadparm.c @@ -3,9 +3,8 @@ /* * 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. + * it under the terms of the GNU General Public License version 2 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 @@ -150,10 +149,10 @@ typedef struct int syslog_facility; int timeout; + BOOL fake_super; BOOL ignore_errors; BOOL ignore_nonreadable; BOOL list; - BOOL munge_symlinks; BOOL read_only; BOOL strict_modes; BOOL transfer_logging; @@ -198,10 +197,10 @@ static service sDefault = /* syslog_facility; */ LOG_DAEMON, /* timeout; */ 0, + /* fake_super; */ False, /* ignore_errors; */ False, /* ignore_nonreadable; */ False, /* list; */ True, - /* munge_symlinks; */ False, /* read_only; */ True, /* strict_modes; */ True, /* transfer_logging; */ False, @@ -300,6 +299,7 @@ static struct parm_struct parm_table[] = {"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}, @@ -315,7 +315,6 @@ static struct parm_struct parm_table[] = {"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}, {"outgoing chmod", P_STRING, P_LOCAL, &sDefault.outgoing_chmod, NULL,0}, {"path", P_PATH, P_LOCAL, &sDefault.path, NULL,0}, @@ -339,7 +338,7 @@ static struct parm_struct parm_table[] = /*************************************************************************** -Initialise the global parameter structure. +* Initialise the global parameter structure. ***************************************************************************/ static void init_globals(void) { @@ -347,7 +346,7 @@ static void init_globals(void) } /*************************************************************************** -Initialise the sDefault parameter structure. +* Initialise the sDefault parameter structure. ***************************************************************************/ static void init_locals(void) { @@ -415,10 +414,10 @@ 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_munge_symlinks, munge_symlinks) FN_LOCAL_BOOL(lp_read_only, read_only) FN_LOCAL_BOOL(lp_strict_modes, strict_modes) FN_LOCAL_BOOL(lp_transfer_logging, transfer_logging) @@ -436,7 +435,7 @@ static BOOL do_section(char *sectionname); /*************************************************************************** -initialise a service to the defaults +* initialise a service to the defaults ***************************************************************************/ static void init_service(service *pservice) { @@ -470,8 +469,8 @@ static void string_set(char **s, const char *v) /*************************************************************************** -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) { @@ -510,7 +509,7 @@ static int add_a_service(service *pservice, char *name) } /*************************************************************************** -Do a case-insensitive, whitespace-ignoring string compare. +* Do a case-insensitive, whitespace-ignoring string compare. ***************************************************************************/ static int strwicmp(char *psz1, char *psz2) { @@ -528,12 +527,11 @@ static int strwicmp(char *psz1, char *psz2) /* sync the strings on first non-whitespace */ while (1) { - while (isspace(* (unsigned char *) psz1)) + while (isSpace(psz1)) psz1++; - while (isspace(* (unsigned char *) psz2)) + while (isSpace(psz2)) psz2++; - if (toupper(* (unsigned char *) psz1) != toupper(* (unsigned char *) psz2) - || *psz1 == '\0' || *psz2 == '\0') + if (toUpper(psz1) != toUpper(psz2) || *psz1 == '\0' || *psz2 == '\0') break; psz1++; psz2++; @@ -542,8 +540,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) { @@ -562,9 +560,9 @@ static int map_parameter(char *parmname) /*************************************************************************** -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) { @@ -590,7 +588,7 @@ 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) { @@ -610,8 +608,7 @@ 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, service *pserviceSource) @@ -656,8 +653,8 @@ 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) { @@ -748,7 +745,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) { @@ -756,9 +753,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) { @@ -803,8 +800,8 @@ 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, int globals_only) { @@ -821,7 +818,7 @@ BOOL lp_load(char *pszFname, int globals_only) if (pszFname) pstrcpy(n2,pszFname); - else if (am_server && !am_root) + else if (am_server && am_root <= 0) pstrcpy(n2,RSYNCD_USERCONF); else pstrcpy(n2,RSYNCD_SYSCONF); @@ -835,7 +832,7 @@ BOOL lp_load(char *pszFname, int globals_only) /*************************************************************************** -return the max number of services +* return the max number of services ***************************************************************************/ int lp_numservices(void) { @@ -843,10 +840,10 @@ 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) {