- {"motd file", P_STRING, P_GLOBAL, &Globals.motd_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},
- {"max verbosity", P_INTEGER, P_GLOBAL, &Globals.max_verbosity, NULL, 0},
- {"port", P_INTEGER, P_GLOBAL, &Globals.rsync_port, NULL, 0},
-
- {"timeout", P_INTEGER, P_LOCAL, &sDefault.timeout, NULL, 0},
- {"max connections", P_INTEGER, P_LOCAL, &sDefault.max_connections,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},
- {"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},
- {"strict modes", P_BOOL, P_LOCAL, &sDefault.strict_modes,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},
- {"include from", P_STRING, P_LOCAL, &sDefault.include_from,NULL, 0},
- {"transfer logging", P_BOOL, P_LOCAL, &sDefault.transfer_logging,NULL,0},
- {"ignore errors", P_BOOL, P_LOCAL, &sDefault.ignore_errors,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}
+ {"address", P_STRING, P_GLOBAL,&Vars.g.bind_address, NULL,0},
+ {"daemon chroot", P_STRING, P_GLOBAL,&Vars.g.daemon_chroot, NULL,0},
+ {"daemon gid", P_STRING, P_GLOBAL,&Vars.g.daemon_gid, NULL,0},
+ {"daemon uid", P_STRING, P_GLOBAL,&Vars.g.daemon_uid, NULL,0},
+ {"listen backlog", P_INTEGER,P_GLOBAL,&Vars.g.listen_backlog, NULL,0},
+ {"motd file", P_STRING, P_GLOBAL,&Vars.g.motd_file, NULL,0},
+ {"pid file", P_STRING, P_GLOBAL,&Vars.g.pid_file, NULL,0},
+ {"port", P_INTEGER,P_GLOBAL,&Vars.g.rsync_port, NULL,0},
+ {"proxy protocol", P_BOOL, P_LOCAL, &Vars.g.proxy_protocol, NULL,0},
+ {"socket options", P_STRING, P_GLOBAL,&Vars.g.socket_options, NULL,0},
+
+ {"auth users", P_STRING, P_LOCAL, &Vars.l.auth_users, NULL,0},
+ {"charset", P_STRING, P_LOCAL, &Vars.l.charset, NULL,0},
+ {"comment", P_STRING, P_LOCAL, &Vars.l.comment, NULL,0},
+ {"dont compress", P_STRING, P_LOCAL, &Vars.l.dont_compress, NULL,0},
+ {"early exec", P_STRING, P_LOCAL, &Vars.l.early_exec, NULL,0},
+ {"exclude from", P_STRING, P_LOCAL, &Vars.l.exclude_from, NULL,0},
+ {"exclude", P_STRING, P_LOCAL, &Vars.l.exclude, NULL,0},
+ {"fake super", P_BOOL, P_LOCAL, &Vars.l.fake_super, NULL,0},
+ {"filter", P_STRING, P_LOCAL, &Vars.l.filter, NULL,0},
+ {"forward lookup", P_BOOL, P_LOCAL, &Vars.l.forward_lookup, NULL,0},
+ {"gid", P_STRING, P_LOCAL, &Vars.l.gid, NULL,0},
+ {"hosts allow", P_STRING, P_LOCAL, &Vars.l.hosts_allow, NULL,0},
+ {"hosts deny", P_STRING, P_LOCAL, &Vars.l.hosts_deny, NULL,0},
+ {"ignore errors", P_BOOL, P_LOCAL, &Vars.l.ignore_errors, NULL,0},
+ {"ignore nonreadable",P_BOOL, P_LOCAL, &Vars.l.ignore_nonreadable, NULL,0},
+ {"include from", P_STRING, P_LOCAL, &Vars.l.include_from, NULL,0},
+ {"include", P_STRING, P_LOCAL, &Vars.l.include, NULL,0},
+ {"incoming chmod", P_STRING, P_LOCAL, &Vars.l.incoming_chmod, NULL,0},
+ {"list", P_BOOL, P_LOCAL, &Vars.l.list, NULL,0},
+ {"lock file", P_STRING, P_LOCAL, &Vars.l.lock_file, NULL,0},
+ {"log file", P_STRING, P_LOCAL, &Vars.l.log_file, NULL,0},
+ {"log format", P_STRING, P_LOCAL, &Vars.l.log_format, NULL,0},
+ {"max connections", P_INTEGER,P_LOCAL, &Vars.l.max_connections, NULL,0},
+ {"max verbosity", P_INTEGER,P_LOCAL, &Vars.l.max_verbosity, NULL,0},
+ {"munge symlinks", P_BOOL, P_LOCAL, &Vars.l.munge_symlinks, NULL,0},
+ {"name", P_STRING, P_LOCAL, &Vars.l.name, NULL,0},
+ {"numeric ids", P_BOOL, P_LOCAL, &Vars.l.numeric_ids, NULL,0},
+ {"outgoing chmod", P_STRING, P_LOCAL, &Vars.l.outgoing_chmod, NULL,0},
+ {"path", P_PATH, P_LOCAL, &Vars.l.path, NULL,0},
+#ifdef HAVE_PUTENV
+ {"post-xfer exec", P_STRING, P_LOCAL, &Vars.l.postxfer_exec, NULL,0},
+ {"pre-xfer exec", P_STRING, P_LOCAL, &Vars.l.prexfer_exec, NULL,0},
+#endif
+ {"read only", P_BOOL, P_LOCAL, &Vars.l.read_only, NULL,0},
+ {"refuse options", P_STRING, P_LOCAL, &Vars.l.refuse_options, NULL,0},
+ {"reverse lookup", P_BOOL, P_LOCAL, &Vars.l.reverse_lookup, NULL,0},
+ {"secrets file", P_STRING, P_LOCAL, &Vars.l.secrets_file, NULL,0},
+ {"strict modes", P_BOOL, P_LOCAL, &Vars.l.strict_modes, NULL,0},
+ {"syslog facility", P_ENUM, P_LOCAL, &Vars.l.syslog_facility, enum_facilities,0},
+ {"syslog tag", P_STRING, P_LOCAL, &Vars.l.syslog_tag, NULL,0},
+ {"temp dir", P_PATH, P_LOCAL, &Vars.l.temp_dir, NULL,0},
+ {"timeout", P_INTEGER,P_LOCAL, &Vars.l.timeout, NULL,0},
+ {"transfer logging", P_BOOL, P_LOCAL, &Vars.l.transfer_logging, NULL,0},
+ {"uid", P_STRING, P_LOCAL, &Vars.l.uid, NULL,0},
+ {"use chroot", P_BOOL, P_LOCAL, &Vars.l.use_chroot, NULL,0},
+ {"write only", P_BOOL, P_LOCAL, &Vars.l.write_only, NULL,0},
+ {NULL, P_BOOL, P_NONE, NULL, NULL,0}