X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/459a83c9ccf8cd6a09dea756226246b15a292b28..bec617b934dc2ef90b7acd1c7ef4b5db74821e91:/loadparm.c diff --git a/loadparm.c b/loadparm.c index 3dcfc4fe..e3608d3e 100644 --- a/loadparm.c +++ b/loadparm.c @@ -101,14 +101,15 @@ typedef struct char *motd_file; char *log_file; char *pid_file; - int syslog_facility; char *socket_options; + char *bind_address; + int syslog_facility; + int rsync_port; } global; static global Globals; - /* * This structure describes a single service. */ @@ -119,6 +120,7 @@ typedef struct char *comment; char *lock_file; BOOL read_only; + BOOL write_only; BOOL list; BOOL use_chroot; BOOL transfer_logging; @@ -130,6 +132,7 @@ typedef struct char *auth_users; char *secrets_file; BOOL strict_modes; + char *filter; char *exclude; char *exclude_from; char *include; @@ -137,8 +140,11 @@ typedef struct char *log_format; char *refuse_options; char *dont_compress; + char *prexfer_exec; + char *postxfer_exec; int timeout; int max_connections; + int max_verbosity; BOOL ignore_nonreadable; } service; @@ -151,26 +157,19 @@ static service sDefault = NULL, /* comment */ DEFAULT_LOCK_FILE, /* lock file */ True, /* read only */ + False, /* write only */ 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 */ - + NOBODY_USER,/* uid */ + NOBODY_GROUP,/* gid */ NULL, /* hosts allow */ NULL, /* hosts deny */ NULL, /* auth users */ NULL, /* secrets file */ True, /* strict modes */ + NULL, /* filter */ NULL, /* exclude */ NULL, /* exclude from */ NULL, /* include */ @@ -178,8 +177,11 @@ static service sDefault = "%o %h [%a] %m (%u) %f %l", /* log format */ NULL, /* refuse options */ "*.gz *.tgz *.zip *.z *.rpm *.deb *.iso *.bz2 *.tbz", /* dont compress */ + NULL, /* prexfer_exec */ + NULL, /* postxfer_exec */ 0, /* timeout */ 0, /* max connections */ + 1, /* max verbosity */ False /* ignore nonreadable */ }; @@ -268,14 +270,18 @@ static struct parm_struct parm_table[] = {"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}, + {"port", P_INTEGER, P_GLOBAL, &Globals.rsync_port, NULL, 0}, + {"address", P_STRING, P_GLOBAL, &Globals.bind_address, NULL, 0}, {"timeout", P_INTEGER, P_LOCAL, &sDefault.timeout, NULL, 0}, {"max connections", P_INTEGER, P_LOCAL, &sDefault.max_connections,NULL, 0}, + {"max verbosity", P_INTEGER, P_LOCAL, &sDefault.max_verbosity,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_PATH, P_LOCAL, &sDefault.path, NULL, 0}, {"read only", P_BOOL, P_LOCAL, &sDefault.read_only, NULL, 0}, + {"write only", P_BOOL, P_LOCAL, &sDefault.write_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}, @@ -286,6 +292,7 @@ static struct parm_struct parm_table[] = {"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}, + {"filter", P_STRING, P_LOCAL, &sDefault.filter, 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}, @@ -295,6 +302,10 @@ static struct parm_struct parm_table[] = {"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}, +#ifdef HAVE_PUTENV + {"pre-xfer exec", P_STRING, P_LOCAL, &sDefault.prexfer_exec, NULL, 0}, + {"post-xfer exec", P_STRING, P_LOCAL, &sDefault.postxfer_exec,NULL, 0}, +#endif {NULL, P_BOOL, P_NONE, NULL, NULL, 0} }; @@ -304,7 +315,7 @@ Initialise the global parameter structure. ***************************************************************************/ static void init_globals(void) { - memset(&Globals, 0, sizeof(Globals)); + memset(&Globals, 0, sizeof Globals); #ifdef LOG_DAEMON Globals.syslog_facility = LOG_DAEMON; #endif @@ -347,12 +358,15 @@ 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_syslog_facility, &Globals.syslog_facility) +FN_GLOBAL_INTEGER(lp_rsync_port, &Globals.rsync_port) +FN_GLOBAL_STRING(lp_bind_address, &Globals.bind_address) 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_write_only, write_only) FN_LOCAL_BOOL(lp_list, list) FN_LOCAL_BOOL(lp_use_chroot, use_chroot) FN_LOCAL_BOOL(lp_transfer_logging, transfer_logging) @@ -365,6 +379,7 @@ 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_filter, filter) FN_LOCAL_STRING(lp_exclude, exclude) FN_LOCAL_STRING(lp_exclude_from, exclude_from) FN_LOCAL_STRING(lp_include, include) @@ -372,8 +387,11 @@ 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_STRING(lp_prexfer_exec, prexfer_exec) +FN_LOCAL_STRING(lp_postxfer_exec, postxfer_exec) FN_LOCAL_INTEGER(lp_timeout, timeout) FN_LOCAL_INTEGER(lp_max_connections, max_connections) +FN_LOCAL_INTEGER(lp_max_verbosity, max_verbosity) /* local prototypes */ static int strwicmp(char *psz1, char *psz2); @@ -441,10 +459,10 @@ static int add_a_service(service *pservice, char *name) i = iNumServices; - ServicePtrs = (service **)Realloc(ServicePtrs,sizeof(service *)*num_to_alloc); + ServicePtrs = realloc_array(ServicePtrs, service *, num_to_alloc); if (ServicePtrs) - pSERVICE(iNumServices) = (service *)malloc(sizeof(service)); + pSERVICE(iNumServices) = new(service); if (!ServicePtrs || !pSERVICE(iNumServices)) return(-1); @@ -665,8 +683,8 @@ static BOOL lp_do_parameter(int snum, char *parmname, char *parmvalue) string_set(parm_ptr,parmvalue); if ((cp = *(char**)parm_ptr) != NULL) { int len = strlen(cp); - while (len && cp[--len] == '/') - cp[len] = '\0'; + while (len > 1 && cp[len-1] == '/') len--; + cp[len] = '\0'; } break; @@ -804,7 +822,7 @@ int lp_number(char *name) int iService; for (iService = iNumServices - 1; iService >= 0; iService--) - if (strequal(lp_name(iService), name)) + if (strcmp(lp_name(iService), name) == 0) break; return (iService);