- Allow --no-v and --no-verbose in the daemon options.

[rsync/rsync.git] / loadparm.c

diff --git a/loadparm.c b/loadparm.c
index 8c06860..e3608d3 100644 (file)
--- a/loadparm.c
+++ b/loadparm.c
@@ -102,8 +102,8 @@ typedef struct
        char *log_file;
        char *pid_file;
        char *socket_options;
+       char *bind_address;
        int syslog_facility;
-       int max_verbosity;
        int rsync_port;
 } global;
 
@@ -132,6 +132,7 @@ typedef struct
        char *auth_users;
        char *secrets_file;
        BOOL strict_modes;
+       char *filter;
        char *exclude;
        char *exclude_from;
        char *include;
@@ -139,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;
 
@@ -158,22 +162,14 @@ static service sDefault =
        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 */
@@ -181,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 */
 };
 
@@ -271,11 +270,12 @@ 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},
-  {"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},
+  {"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},
@@ -292,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},
@@ -301,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}
 };
 
@@ -314,7 +319,6 @@ static void init_globals(void)
 #ifdef LOG_DAEMON
        Globals.syslog_facility = LOG_DAEMON;
 #endif
-       Globals.max_verbosity = 1;
 }
 
 /***************************************************************************
@@ -354,8 +358,8 @@ 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_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 +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)
@@ -382,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);