Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Various xattr fixes:
[rsync/rsync.git]
/
loadparm.c
diff --git
a/loadparm.c
b/loadparm.c
index
be3dc63
..
982fda7
100644
(file)
--- a/
loadparm.c
+++ b/
loadparm.c
@@
-3,8
+3,9
@@
/*
* This program is free software; you can redistribute it and/or modify
/*
* 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
*
* 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
* 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
*/
/* some fixes
@@
-50,6
+50,7
@@
/* TODO: Parameter to set debug level on server. */
#include "rsync.h"
/* 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")
#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 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
{
/* the following are used by loadparm for option lists */
typedef enum
{
@@
-169,7
+173,7
@@
static service sDefault =
{
/* auth_users; */ NULL,
/* comment; */ NULL,
{
/* 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,
/* exclude; */ NULL,
/* exclude_from; */ NULL,
/* filter; */ NULL,
@@
-554,7
+558,7
@@
static int map_parameter(char *parmname)
if (strwicmp(parm_table[iIndex].label, parmname) == 0)
return(iIndex);
if (strwicmp(parm_table[iIndex].label, parmname) == 0)
return(iIndex);
- rprintf(F
ERROR
, "Unknown Parameter encountered: \"%s\"\n", parmname);
+ rprintf(F
LOG
, "Unknown Parameter encountered: \"%s\"\n", parmname);
return(-1);
}
return(-1);
}
@@
-580,7
+584,7
@@
static BOOL set_boolean(BOOL *pb, char *parmvalue)
*pb = False;
else
{
*pb = False;
else
{
- rprintf(F
ERROR
, "Badly formed boolean in configuration file: \"%s\".\n",
+ rprintf(F
LOG
, "Badly formed boolean in configuration file: \"%s\".\n",
parmvalue);
bRetval = False;
}
parmvalue);
bRetval = False;
}
@@
-667,7
+671,7
@@
static BOOL lp_do_parameter(int snum, char *parmname, char *parmvalue)
if (parmnum < 0)
{
if (parmnum < 0)
{
- rprintf(F
ERROR
, "IGNORING unknown parameter \"%s\"\n", parmname);
+ rprintf(F
LOG
, "IGNORING unknown parameter \"%s\"\n", parmname);
return(True);
}
return(True);
}
@@
-678,7
+682,7
@@
static BOOL lp_do_parameter(int snum, char *parmname, char *parmvalue)
parm_ptr = def_ptr;
} else {
if (parm_table[parmnum].class == P_GLOBAL) {
parm_ptr = def_ptr;
} else {
if (parm_table[parmnum].class == P_GLOBAL) {
- rprintf(F
ERROR
, "Global parameter %s found in service section!\n",parmname);
+ rprintf(F
LOG
, "Global parameter %s found in service section!\n",parmname);
return(True);
}
parm_ptr = ((char *)pSERVICE(snum)) + PTR_DIFF(def_ptr,&sDefault);
return(True);
}
parm_ptr = ((char *)pSERVICE(snum)) + PTR_DIFF(def_ptr,&sDefault);
@@
-790,7
+794,7
@@
static BOOL do_section(char *sectionname)
if ((iServiceIndex=add_a_service(&sDefault,sectionname)) < 0)
{
if ((iServiceIndex=add_a_service(&sDefault,sectionname)) < 0)
{
- rprintf(F
ERROR,
"Failed to add a new service\n");
+ rprintf(F
LOG,
"Failed to add a new service\n");
return(False);
}
}
return(False);
}
}
@@
-805,8
+809,6
@@
static BOOL do_section(char *sectionname)
***************************************************************************/
BOOL lp_load(char *pszFname, int globals_only)
{
***************************************************************************/
BOOL lp_load(char *pszFname, int globals_only)
{
- extern int am_server;
- extern int am_root;
pstring n2;
BOOL bRetval;
pstring n2;
BOOL bRetval;
@@
-816,12
+818,7
@@
BOOL lp_load(char *pszFname, int globals_only)
init_globals();
init_globals();
- if (pszFname)
- pstrcpy(n2,pszFname);
- else if (am_server && am_root <= 0)
- 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;
/* We get sections first, so have to start 'behind' to make up */
iServiceIndex = -1;