X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/09e13ae2dc74f82c46129d943e20c5a591449285..9e3c856a39fe363e5459e1b24c082535282ce71a:/loadparm.c diff --git a/loadparm.c b/loadparm.c index f8ec868a..03440fea 100644 --- a/loadparm.c +++ b/loadparm.c @@ -47,12 +47,11 @@ #define BOOL int #define False 0 #define True 1 -#define Realloc realloc #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 @@ -99,8 +98,11 @@ typedef struct { char *motd_file; char *lock_file; + char *log_file; + char *pid_file; int syslog_facility; int max_connections; + char *socket_options; } global; static global Globals; @@ -117,12 +119,20 @@ typedef struct char *comment; BOOL read_only; BOOL list; + BOOL use_chroot; + BOOL transfer_logging; char *uid; char *gid; char *hosts_allow; char *hosts_deny; char *auth_users; char *secrets_file; + char *exclude; + char *exclude_from; + char *log_format; + char *refuse_options; + char *dont_compress; + int timeout; } service; @@ -134,12 +144,20 @@ static service sDefault = NULL, /* comment */ True, /* read only */ True, /* list */ + True, /* use chroot */ + False, /* transfer logging */ "nobody",/* uid */ "nobody",/* gid */ NULL, /* hosts allow */ NULL, /* hosts deny */ NULL, /* auth users */ NULL, /* secrets file */ + NULL, /* exclude */ + NULL, /* exclude from */ + "%o %h [%a] %m (%u) %f %l", /* log format */ + NULL, /* refuse options */ + "*.gz *.tgz *.zip *.z *.rpm *.deb", /* dont compress */ + 0 /* timeout */ }; @@ -226,17 +244,29 @@ static struct parm_struct parm_table[] = {"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}, {"name", P_STRING, P_LOCAL, &sDefault.name, NULL, 0}, {"comment", P_STRING, P_LOCAL, &sDefault.comment, 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}, {"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}, + {"exclude", P_STRING, P_LOCAL, &sDefault.exclude, NULL, 0}, + {"exclude from", P_STRING, P_LOCAL, &sDefault.exclude_from,NULL, 0}, + {"transfer logging", P_BOOL, P_LOCAL, &sDefault.transfer_logging,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} }; @@ -246,6 +276,7 @@ Initialise the global parameter structure. ***************************************************************************/ static void init_globals(void) { + memset(&Globals, 0, sizeof(Globals)); #ifdef LOG_DAEMON Globals.syslog_facility = LOG_DAEMON; #endif @@ -286,19 +317,31 @@ 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_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_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_STRING(lp_exclude, exclude) +FN_LOCAL_STRING(lp_exclude_from, exclude_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) /* local prototypes */ static int strwicmp( char *psz1, char *psz2 ); @@ -316,7 +359,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); } @@ -327,7 +370,7 @@ static void string_set(char **s, char *v) return; } *s = strdup(v); - if (!*s) exit_cleanup(1); + if (!*s) exit_cleanup(RERR_MALLOC); } @@ -354,6 +397,7 @@ static int add_a_service(service *pservice, char *name) i = iNumServices; ServicePtrs = (service **)Realloc(ServicePtrs,sizeof(service *)*num_to_alloc); + if (ServicePtrs) pSERVICE(iNumServices) = (service *)malloc(sizeof(service)); @@ -574,7 +618,7 @@ static BOOL lp_do_parameter(int snum, char *parmname, char *parmvalue) break; case P_GSTRING: - strcpy((char *)parm_ptr,parmvalue); + strlcpy((char *)parm_ptr,parmvalue,sizeof(pstring)); break; case P_ENUM: @@ -584,6 +628,10 @@ static BOOL lp_do_parameter(int snum, char *parmname, char *parmvalue) break; } } + if (!parm_table[parmnum].enum_list[i].name) { + if (atoi(parmvalue) > 0) + *(int *)parm_ptr = atoi(parmvalue); + } break; case P_SEP: break; @@ -651,26 +699,26 @@ static BOOL do_section(char *sectionname) Load the services array from the services file. Return True on success, False on failure. ***************************************************************************/ -BOOL lp_load(char *pszFname) +BOOL lp_load(char *pszFname, int globals_only) { - pstring n2; - BOOL bRetval; + pstring n2; + BOOL bRetval; - bRetval = False; + bRetval = False; - bInGlobalSection = True; + bInGlobalSection = True; - init_globals(); + init_globals(); - pstrcpy(n2,pszFname); + pstrcpy(n2,pszFname); - /* We get sections first, so have to start 'behind' to make up */ - iServiceIndex = -1; - bRetval = pm_process(n2, do_section, do_parameter); + /* 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; + bLoaded = True; - return (bRetval); + return (bRetval); }