X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/6cdc6b13443c7b760d136bafd5253ef1ddf7f3cd..a57568d7167cb54b9b0802aeabf5a424749fbd65:/loadparm.c diff --git a/loadparm.c b/loadparm.c index 0ddbc61a..b09dde6b 100644 --- a/loadparm.c +++ b/loadparm.c @@ -44,14 +44,11 @@ */ #include "rsync.h" -#define BOOL int -#define False 0 -#define True 1 #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") typedef char pstring[1024]; -#define pstrcpy(a,b) strlcpy(a,b,sizeof(pstring)-1) +#define pstrcpy(a,b) strlcpy(a,b,sizeof(pstring)) /* the following are used by loadparm for option lists */ typedef enum @@ -80,8 +77,6 @@ struct parm_struct unsigned flags; }; -static BOOL bLoaded = False; - #ifndef GLOBAL_NAME #define GLOBAL_NAME "global" #endif @@ -97,9 +92,9 @@ static BOOL bLoaded = False; typedef struct { char *motd_file; - char *lock_file; + char *log_file; + char *pid_file; int syslog_facility; - int max_connections; char *socket_options; } global; @@ -115,16 +110,29 @@ typedef struct char *name; char *path; char *comment; + char *lock_file; BOOL read_only; 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 *include_from; + char *log_format; + char *refuse_options; + char *dont_compress; + int timeout; + int max_connections; + BOOL ignore_nonreadable; } service; @@ -134,16 +142,29 @@ static service sDefault = NULL, /* name */ NULL, /* path */ NULL, /* comment */ + DEFAULT_LOCK_FILE, /* lock file */ True, /* read only */ True, /* list */ + True, /* use chroot */ + False, /* transfer logging */ + False, /* ignore errors */ "nobody",/* uid */ "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 *.iso *.bz2 *.tbz", /* dont compress */ + 0, /* timeout */ + 0, /* max connections */ + False /* ignore nonreadable */ }; @@ -226,25 +247,38 @@ static struct enum_list enum_facilities[] = { /* note that we do not initialise the defaults union - it is not allowed in ANSI C */ static struct parm_struct parm_table[] = { - {"max connections", P_INTEGER, P_GLOBAL, &Globals.max_connections,NULL, 0}, {"motd file", P_STRING, P_GLOBAL, &Globals.motd_file, NULL, 0}, - {"lock file", P_STRING, P_GLOBAL, &Globals.lock_file, NULL, 0}, {"syslog facility", P_ENUM, P_GLOBAL, &Globals.syslog_facility, enum_facilities,0}, {"socket options", P_STRING, P_GLOBAL, &Globals.socket_options,NULL, 0}, + {"log file", P_STRING, P_GLOBAL, &Globals.log_file, NULL, 0}, + {"pid file", P_STRING, P_GLOBAL, &Globals.pid_file, NULL, 0}, + {"timeout", P_INTEGER, P_LOCAL, &sDefault.timeout, NULL, 0}, + {"max connections", P_INTEGER, P_LOCAL, &sDefault.max_connections,NULL, 0}, {"name", P_STRING, P_LOCAL, &sDefault.name, NULL, 0}, {"comment", P_STRING, P_LOCAL, &sDefault.comment, NULL, 0}, + {"lock file", P_STRING, P_LOCAL, &sDefault.lock_file, NULL, 0}, {"path", P_STRING, P_LOCAL, &sDefault.path, NULL, 0}, {"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}, {NULL, P_BOOL, P_NONE, NULL, NULL, 0} }; @@ -258,7 +292,6 @@ static void init_globals(void) #ifdef LOG_DAEMON Globals.syslog_facility = LOG_DAEMON; #endif - Globals.lock_file = "/var/run/rsyncd.lock"; } /*************************************************************************** @@ -294,24 +327,37 @@ static void init_locals(void) FN_GLOBAL_STRING(lp_motd_file, &Globals.motd_file) -FN_GLOBAL_STRING(lp_lock_file, &Globals.lock_file) +FN_GLOBAL_STRING(lp_log_file, &Globals.log_file) +FN_GLOBAL_STRING(lp_pid_file, &Globals.pid_file) FN_GLOBAL_STRING(lp_socket_options, &Globals.socket_options) -FN_GLOBAL_INTEGER(lp_max_connections, &Globals.max_connections) FN_GLOBAL_INTEGER(lp_syslog_facility, &Globals.syslog_facility) FN_LOCAL_STRING(lp_name, name) FN_LOCAL_STRING(lp_comment, comment) FN_LOCAL_STRING(lp_path, path) +FN_LOCAL_STRING(lp_lock_file, lock_file) FN_LOCAL_BOOL(lp_read_only, read_only) 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_STRING(lp_include_from, include_from) +FN_LOCAL_STRING(lp_log_format, log_format) +FN_LOCAL_STRING(lp_refuse_options, refuse_options) +FN_LOCAL_STRING(lp_dont_compress, dont_compress) +FN_LOCAL_INTEGER(lp_timeout, timeout) +FN_LOCAL_INTEGER(lp_max_connections, max_connections) /* local prototypes */ static int strwicmp( char *psz1, char *psz2 ); @@ -329,7 +375,7 @@ initialise a service to the defaults ***************************************************************************/ static void init_service(service *pservice) { - bzero((char *)pservice,sizeof(service)); + memset((char *)pservice,0,sizeof(service)); copy_service(pservice,&sDefault); } @@ -340,7 +386,7 @@ static void string_set(char **s, char *v) return; } *s = strdup(v); - if (!*s) exit_cleanup(1); + if (!*s) exit_cleanup(RERR_MALLOC); } @@ -366,12 +412,7 @@ static int add_a_service(service *pservice, char *name) i = iNumServices; - if (ServicePtrs) { - ServicePtrs = (service **)realloc(ServicePtrs, - sizeof(service *)*num_to_alloc); - } else { - ServicePtrs = (service **)malloc(sizeof(service *)*num_to_alloc); - } + ServicePtrs = (service **)Realloc(ServicePtrs,sizeof(service *)*num_to_alloc); if (ServicePtrs) pSERVICE(iNumServices) = (service *)malloc(sizeof(service)); @@ -435,7 +476,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(FERROR, "Unknown Parameter encountered: \"%s\"\n", parmname); return(-1); } @@ -547,7 +588,7 @@ static BOOL lp_do_parameter(int snum, char *parmname, char *parmvalue) if (parmnum < 0) { - rprintf(FERROR, "Ignoring unknown parameter \"%s\"\n", parmname); + rprintf(FERROR, "IGNORING unknown parameter \"%s\"\n", parmname); return(True); } @@ -593,7 +634,7 @@ static BOOL lp_do_parameter(int snum, char *parmname, char *parmvalue) break; case P_GSTRING: - strlcpy((char *)parm_ptr,parmvalue,sizeof(pstring)-1); + strlcpy((char *)parm_ptr,parmvalue,sizeof(pstring)); break; case P_ENUM: @@ -691,8 +732,6 @@ BOOL lp_load(char *pszFname, int globals_only) iServiceIndex = -1; bRetval = pm_process(n2, globals_only?NULL:do_section, do_parameter); - bLoaded = True; - return (bRetval); }