X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/ba2133d6add082b059728074febdac6c520a4351..62a6b8df72d18f0b13462ee7ac33f9a8a46ef0b5:/loadparm.c diff --git a/loadparm.c b/loadparm.c index d82c205a..0915000d 100644 --- a/loadparm.c +++ b/loadparm.c @@ -3,8 +3,9 @@ /* * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. + * 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 @@ -12,8 +13,7 @@ * 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., - * 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. + * with this program; if not, visit the http://fsf.org website. */ /* some fixes @@ -50,6 +50,7 @@ /* 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) #define BOOLSTR(b) ((b) ? "Yes" : "No") @@ -60,6 +61,9 @@ typedef char pstring[1024]; #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 { @@ -149,9 +153,11 @@ 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; @@ -168,7 +174,7 @@ static service sDefault = { /* auth_users; */ NULL, /* comment; */ NULL, - /* dont_compress; */ "*.gz *.tgz *.zip *.z *.rpm *.deb *.iso *.bz2 *.tbz", + /* dont_compress; */ DEFAULT_DONT_COMPRESS, /* exclude; */ NULL, /* exclude_from; */ NULL, /* filter; */ NULL, @@ -196,9 +202,11 @@ static service sDefault = /* syslog_facility; */ LOG_DAEMON, /* timeout; */ 0, + /* fake_super; */ False, /* ignore_errors; */ False, /* ignore_nonreadable; */ False, /* list; */ True, + /* munge_symlinks; */ (BOOL)-1, /* read_only; */ True, /* strict_modes; */ True, /* transfer_logging; */ False, @@ -297,6 +305,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}, @@ -312,6 +321,7 @@ 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}, @@ -411,9 +421,11 @@ 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) @@ -550,7 +562,7 @@ static int map_parameter(char *parmname) if (strwicmp(parm_table[iIndex].label, parmname) == 0) return(iIndex); - rprintf(FERROR, "Unknown Parameter encountered: \"%s\"\n", parmname); + rprintf(FLOG, "Unknown Parameter encountered: \"%s\"\n", parmname); return(-1); } @@ -576,7 +588,7 @@ static BOOL set_boolean(BOOL *pb, char *parmvalue) *pb = False; else { - rprintf(FERROR, "Badly formed boolean in configuration file: \"%s\".\n", + rprintf(FLOG, "Badly formed boolean in configuration file: \"%s\".\n", parmvalue); bRetval = False; } @@ -663,7 +675,7 @@ static BOOL lp_do_parameter(int snum, char *parmname, char *parmvalue) if (parmnum < 0) { - rprintf(FERROR, "IGNORING unknown parameter \"%s\"\n", parmname); + rprintf(FLOG, "IGNORING unknown parameter \"%s\"\n", parmname); return(True); } @@ -674,7 +686,7 @@ static BOOL lp_do_parameter(int snum, char *parmname, char *parmvalue) parm_ptr = def_ptr; } else { if (parm_table[parmnum].class == P_GLOBAL) { - rprintf(FERROR, "Global parameter %s found in service section!\n",parmname); + rprintf(FLOG, "Global parameter %s found in service section!\n",parmname); return(True); } parm_ptr = ((char *)pSERVICE(snum)) + PTR_DIFF(def_ptr,&sDefault); @@ -786,7 +798,7 @@ static BOOL do_section(char *sectionname) if ((iServiceIndex=add_a_service(&sDefault,sectionname)) < 0) { - rprintf(FERROR,"Failed to add a new service\n"); + rprintf(FLOG, "Failed to add a new service\n"); return(False); } } @@ -801,8 +813,6 @@ static BOOL do_section(char *sectionname) ***************************************************************************/ BOOL lp_load(char *pszFname, int globals_only) { - extern int am_server; - extern int am_root; pstring n2; BOOL bRetval; @@ -812,12 +822,7 @@ BOOL lp_load(char *pszFname, int globals_only) init_globals(); - if (pszFname) - pstrcpy(n2,pszFname); - else if (am_server && !am_root) - pstrcpy(n2,RSYNCD_USERCONF); - else - pstrcpy(n2,RSYNCD_SYSCONF); + pstrcpy(n2, pszFname); /* We get sections first, so have to start 'behind' to make up */ iServiceIndex = -1;