In clean_flist(), if a duplicate is found for a dir and a non-dir,

[rsync/rsync.git] / loadparm.c

diff --git a/loadparm.c b/loadparm.c
index 8c06860..ae8a677 100644 (file)
--- a/loadparm.c
+++ b/loadparm.c
@@ -102,6 +102,7 @@ typedef struct
        char *log_file;
        char *pid_file;
        char *socket_options;
+       char *bind_address;
        int syslog_facility;
        int max_verbosity;
        int rsync_port;
@@ -132,6 +133,7 @@ typedef struct
        char *auth_users;
        char *secrets_file;
        BOOL strict_modes;
+       char *filter;
        char *exclude;
        char *exclude_from;
        char *include;
@@ -174,6 +176,7 @@ static service sDefault =
        NULL,    /* auth users */
        NULL,    /* secrets file */
        True,   /* strict modes */
+       NULL,    /* filter */
        NULL,    /* exclude */
        NULL,    /* exclude from */
        NULL,    /* include */
@@ -273,6 +276,7 @@ static struct parm_struct parm_table[] =
   {"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},
@@ -292,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},
+  {"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},
@@ -356,6 +361,7 @@ 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)
@@ -375,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_filter, filter)
 FN_LOCAL_STRING(lp_exclude, exclude)
 FN_LOCAL_STRING(lp_exclude_from, exclude_from)
 FN_LOCAL_STRING(lp_include, include)