/* 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 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
{
{
/* 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,
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);
}
*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;
}
if (parmnum < 0)
{
- rprintf(FERROR, "IGNORING unknown parameter \"%s\"\n", parmname);
+ rprintf(FLOG, "IGNORING unknown parameter \"%s\"\n", parmname);
return(True);
}
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);
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);
}
}
***************************************************************************/
BOOL lp_load(char *pszFname, int globals_only)
{
- extern int am_server;
- extern int am_root;
pstring n2;
BOOL bRetval;
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;