Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Preparing for release of 2.6.4pre2
[rsync/rsync.git]
/
loadparm.c
diff --git
a/loadparm.c
b/loadparm.c
index
9dc80e7
..
ae8a677
100644
(file)
--- a/
loadparm.c
+++ b/
loadparm.c
@@
-101,14
+101,16
@@
typedef struct
char *motd_file;
char *log_file;
char *pid_file;
char *motd_file;
char *log_file;
char *pid_file;
- int syslog_facility;
char *socket_options;
char *socket_options;
+ char *bind_address;
+ int syslog_facility;
+ int max_verbosity;
+ int rsync_port;
} global;
static global Globals;
} global;
static global Globals;
-
/*
* This structure describes a single service.
*/
/*
* This structure describes a single service.
*/
@@
-119,6
+121,7
@@
typedef struct
char *comment;
char *lock_file;
BOOL read_only;
char *comment;
char *lock_file;
BOOL read_only;
+ BOOL write_only;
BOOL list;
BOOL use_chroot;
BOOL transfer_logging;
BOOL list;
BOOL use_chroot;
BOOL transfer_logging;
@@
-130,6
+133,7
@@
typedef struct
char *auth_users;
char *secrets_file;
BOOL strict_modes;
char *auth_users;
char *secrets_file;
BOOL strict_modes;
+ char *filter;
char *exclude;
char *exclude_from;
char *include;
char *exclude;
char *exclude_from;
char *include;
@@
-151,6
+155,7
@@
static service sDefault =
NULL, /* comment */
DEFAULT_LOCK_FILE, /* lock file */
True, /* read only */
NULL, /* comment */
DEFAULT_LOCK_FILE, /* lock file */
True, /* read only */
+ False, /* write only */
True, /* list */
True, /* use chroot */
False, /* transfer logging */
True, /* list */
True, /* use chroot */
False, /* transfer logging */
@@
-171,6
+176,7
@@
static service sDefault =
NULL, /* auth users */
NULL, /* secrets file */
True, /* strict modes */
NULL, /* auth users */
NULL, /* secrets file */
True, /* strict modes */
+ NULL, /* filter */
NULL, /* exclude */
NULL, /* exclude from */
NULL, /* include */
NULL, /* exclude */
NULL, /* exclude from */
NULL, /* include */
@@
-268,6
+274,9
@@
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},
{"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},
+ {"max verbosity", P_INTEGER, P_GLOBAL, &Globals.max_verbosity, 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},
{"timeout", P_INTEGER, P_LOCAL, &sDefault.timeout, NULL, 0},
{"max connections", P_INTEGER, P_LOCAL, &sDefault.max_connections,NULL, 0},
@@
-276,6
+285,7
@@
static struct parm_struct parm_table[] =
{"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},
{"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},
{"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
+296,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},
{"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},
{"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},
@@
-304,10
+315,11
@@
Initialise the global parameter structure.
***************************************************************************/
static void init_globals(void)
{
***************************************************************************/
static void init_globals(void)
{
- memset(&Globals, 0, sizeof
(Globals)
);
+ memset(&Globals, 0, sizeof
Globals
);
#ifdef LOG_DAEMON
Globals.syslog_facility = LOG_DAEMON;
#endif
#ifdef LOG_DAEMON
Globals.syslog_facility = LOG_DAEMON;
#endif
+ Globals.max_verbosity = 1;
}
/***************************************************************************
}
/***************************************************************************
@@
-347,12
+359,16
@@
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_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_max_verbosity, &Globals.max_verbosity)
+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_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)
FN_LOCAL_BOOL(lp_list, list)
FN_LOCAL_BOOL(lp_use_chroot, use_chroot)
FN_LOCAL_BOOL(lp_transfer_logging, transfer_logging)
@@
-365,6
+381,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_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)
FN_LOCAL_STRING(lp_exclude, exclude)
FN_LOCAL_STRING(lp_exclude_from, exclude_from)
FN_LOCAL_STRING(lp_include, include)
@@
-441,10
+458,10
@@
static int add_a_service(service *pservice, char *name)
i = iNumServices;
i = iNumServices;
- ServicePtrs =
(service **)Realloc(ServicePtrs,sizeof(service *)*
num_to_alloc);
+ ServicePtrs =
realloc_array(ServicePtrs, service *,
num_to_alloc);
if (ServicePtrs)
if (ServicePtrs)
- pSERVICE(iNumServices) =
(service *)malloc(sizeof(service)
);
+ pSERVICE(iNumServices) =
new(service
);
if (!ServicePtrs || !pSERVICE(iNumServices))
return(-1);
if (!ServicePtrs || !pSERVICE(iNumServices))
return(-1);
@@
-804,7
+821,7
@@
int lp_number(char *name)
int iService;
for (iService = iNumServices - 1; iService >= 0; iService--)
int iService;
for (iService = iNumServices - 1; iService >= 0; iService--)
- if (str
equal(lp_name(iService), name)
)
+ if (str
cmp(lp_name(iService), name) == 0
)
break;
return (iService);
break;
return (iService);