/* This is based on loadparm.c from Samba, written by Andrew Tridgell
and Karl Auer */
-/*
+/* some fixes
+ *
+ * Copyright (C) 2001, 2002 by Martin Pool <mbp@samba.org>
+ */
+
+/*
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.
* 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
*
*/
+/* TODO: Parameter to set debug level on server. */
+
#include "rsync.h"
#define PTR_DIFF(p1,p2) ((ptrdiff_t)(((char *)(p1)) - (char *)(p2)))
#define strequal(a,b) (strcasecmp(a,b)==0)
unsigned flags;
};
-static BOOL bLoaded = False;
-
#ifndef GLOBAL_NAME
#define GLOBAL_NAME "global"
#endif
#define iSERVICE(i) (*pSERVICE(i))
#define LP_SNUM_OK(iService) (((iService) >= 0) && ((iService) < iNumServices))
-/*
+/*
* This structure describes global (ie., server-wide) parameters.
*/
typedef struct
-/*
- * This structure describes a single service.
+/*
+ * This structure describes a single service.
*/
typedef struct
{
BOOL list;
BOOL use_chroot;
BOOL transfer_logging;
+ BOOL ignore_errors;
char *uid;
char *gid;
char *hosts_allow;
char *hosts_deny;
char *auth_users;
char *secrets_file;
+ BOOL strict_modes;
char *exclude;
char *exclude_from;
char *include;
char *dont_compress;
int timeout;
int max_connections;
+ BOOL ignore_nonreadable;
} service;
/* This is a default service used to prime a services structure */
-static service sDefault =
+static service sDefault =
{
NULL, /* name */
NULL, /* path */
True, /* list */
True, /* use chroot */
False, /* transfer logging */
+ False, /* ignore errors */
"nobody",/* uid */
+
+ /* TODO: This causes problems on Debian, where it is called
+ * "nogroup". Debian patch this in their version of the
+ * package, but it would be nice to be consistent. Possibly
+ * other systems are different again.
+ *
+ * What is the best behaviour? Perhaps always using (gid_t)
+ * -2? */
"nobody",/* gid */
+
NULL, /* hosts allow */
NULL, /* hosts deny */
NULL, /* auth users */
NULL, /* secrets file */
+ True, /* strict modes */
NULL, /* exclude */
NULL, /* exclude from */
NULL, /* include */
NULL, /* include from */
"%o %h [%a] %m (%u) %f %l", /* log format */
NULL, /* refuse options */
- "*.gz *.tgz *.zip *.z *.rpm *.deb", /* dont compress */
+ "*.gz *.tgz *.zip *.z *.rpm *.deb *.iso *.bz2 *.tbz", /* dont compress */
0, /* timeout */
- 0 /* max connections */
+ 0, /* max connections */
+ False /* ignore nonreadable */
};
{ LOG_NEWS, "news" },
#endif
#ifdef LOG_AUTH
- { LOG_AUTH, "security" },
+ { LOG_AUTH, "security" },
#endif
#ifdef LOG_SYSLOG
{ LOG_SYSLOG, "syslog" },
{"read only", P_BOOL, P_LOCAL, &sDefault.read_only, NULL, 0},
{"list", P_BOOL, P_LOCAL, &sDefault.list, NULL, 0},
{"use chroot", P_BOOL, P_LOCAL, &sDefault.use_chroot, NULL, 0},
+ {"ignore nonreadable",P_BOOL, P_LOCAL, &sDefault.ignore_nonreadable, 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},
+ {"strict modes", P_BOOL, P_LOCAL, &sDefault.strict_modes,NULL, 0},
{"exclude", P_STRING, P_LOCAL, &sDefault.exclude, NULL, 0},
{"exclude from", P_STRING, P_LOCAL, &sDefault.exclude_from,NULL, 0},
{"include", P_STRING, P_LOCAL, &sDefault.include, NULL, 0},
{"include from", P_STRING, P_LOCAL, &sDefault.include_from,NULL, 0},
{"transfer logging", P_BOOL, P_LOCAL, &sDefault.transfer_logging,NULL,0},
+ {"ignore errors", P_BOOL, P_LOCAL, &sDefault.ignore_errors,NULL,0},
{"log format", P_STRING, P_LOCAL, &sDefault.log_format, NULL, 0},
{"refuse options", P_STRING, P_LOCAL, &sDefault.refuse_options,NULL, 0},
{"dont compress", P_STRING, P_LOCAL, &sDefault.dont_compress,NULL, 0},
/*
- 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) \
FN_LOCAL_BOOL(lp_list, list)
FN_LOCAL_BOOL(lp_use_chroot, use_chroot)
FN_LOCAL_BOOL(lp_transfer_logging, transfer_logging)
+FN_LOCAL_BOOL(lp_ignore_errors, ignore_errors)
+FN_LOCAL_BOOL(lp_ignore_nonreadable, ignore_nonreadable)
FN_LOCAL_STRING(lp_uid, uid)
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_secrets_file, secrets_file)
+FN_LOCAL_BOOL(lp_strict_modes, strict_modes)
FN_LOCAL_STRING(lp_exclude, exclude)
FN_LOCAL_STRING(lp_exclude_from, exclude_from)
FN_LOCAL_STRING(lp_include, include)
FN_LOCAL_INTEGER(lp_max_connections, max_connections)
/* 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);
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(RERR_MALLOC);
+ if (!*s)
+ exit_cleanup(RERR_MALLOC);
}
/***************************************************************************
-add a new service to the services array initialising it with the given
+add a new service to the services array initialising it with the given
service
***************************************************************************/
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)
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);
}
/* sync the strings on first non-whitespace */
while (1)
{
- while (isspace(*psz1))
+ while (isspace(* (unsigned char *) psz1))
psz1++;
- while (isspace(*psz2))
+ while (isspace(* (unsigned char *) psz2))
psz2++;
- if (toupper(*psz1) != toupper(*psz2) || *psz1 == '\0' || *psz2 == '\0')
+ if (toupper(* (unsigned char *) psz1) != toupper(* (unsigned char *) psz2)
+ || *psz1 == '\0' || *psz2 == '\0')
break;
psz1++;
psz2++;
}
/***************************************************************************
-Map a parameter's string representation to something we can use.
+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)
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);
/***************************************************************************
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
+Returns True in success, False if the passed string does not correctly
represent a boolean.
***************************************************************************/
static BOOL set_boolean(BOOL *pb, char *parmvalue)
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));
Copy a service structure to another
***************************************************************************/
-static void copy_service(service *pserviceDest,
+static void copy_service(service *pserviceDest,
service *pserviceSource)
{
int i;
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)
init_locals();
/* if we've just struck a global section, note the fact. */
- bInGlobalSection = isglobal;
+ bInGlobalSection = isglobal;
/* check for multiple global sections */
if (bInGlobalSection)
/***************************************************************************
-Load the services array from the services file. Return True on success,
+Load the services array from the services file. Return True on success,
False on failure.
***************************************************************************/
BOOL lp_load(char *pszFname, int globals_only)
{
+ extern int am_server;
+ extern int am_daemon;
+ extern int am_root;
pstring n2;
BOOL bRetval;
-
+
bRetval = False;
bInGlobalSection = True;
-
+
init_globals();
- pstrcpy(n2,pszFname);
+ if (pszFname)
+ pstrcpy(n2,pszFname);
+ else if (am_server && am_daemon && !am_root)
+ 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, globals_only?NULL:do_section, do_parameter);
-
- bLoaded = True;
return (bRetval);
}
int iService;
for (iService = iNumServices - 1; iService >= 0; iService--)
- if (strequal(lp_name(iService), name))
+ if (strequal(lp_name(iService), name))
break;
return (iService);
Matt McCutchen's Web Site / rsync / rsync.git / blobdiff