.
#
@@ -580,8 +580,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='rsync'
PACKAGE_TARNAME='rsync'
-PACKAGE_VERSION='3.2.1'
-PACKAGE_STRING='rsync 3.2.1'
+PACKAGE_VERSION=' '
+PACKAGE_STRING='rsync '
PACKAGE_BUGREPORT='https://rsync.samba.org/bugtracking.html'
PACKAGE_URL=''
@@ -667,7 +667,6 @@ build_os
build_vendor
build_cpu
build
-RSYNC_VERSION
target_alias
host_alias
build_alias
@@ -1297,7 +1296,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures rsync 3.2.1 to adapt to many kinds of systems.
+\`configure' configures rsync to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1363,7 +1362,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of rsync 3.2.1:";;
+ short | recursive ) echo "Configuration of rsync :";;
esac
cat <<\_ACEOF
@@ -1482,7 +1481,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-rsync configure 3.2.1
+rsync configure
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2225,7 +2224,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by rsync $as_me 3.2.1, which was
+It was created by rsync $as_me , which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2581,17 +2580,11 @@ ac_config_headers="$ac_config_headers co
-RSYNC_VERSION=$PACKAGE_VERSION
+PACKAGE_VERSION=`sed 's/.*"\(.*\)".*/\1/' <$srcdir/version.h`
{ $as_echo "$as_me:${as_lineno-$LINENO}: Configuring rsync $PACKAGE_VERSION" >&5
$as_echo "$as_me: Configuring rsync $PACKAGE_VERSION" >&6;}
-
-cat >>confdefs.h <<_ACEOF
-#define RSYNC_VERSION "$PACKAGE_VERSION"
-_ACEOF
-
-
LDFLAGS=${LDFLAGS-""}
ac_aux_dir=
@@ -10558,7 +10551,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_wri
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by rsync $as_me 3.2.1, which was
+This file was extended by rsync $as_me , which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -10620,7 +10613,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-rsync config.status 3.2.1
+rsync config.status
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
@@ -11345,7 +11338,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5
$as_echo "" >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: rsync ${RSYNC_VERSION} configuration successful" >&5
-$as_echo " rsync ${RSYNC_VERSION} configuration successful" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: rsync $PACKAGE_VERSION configuration successful" >&5
+$as_echo " rsync $PACKAGE_VERSION configuration successful" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5
$as_echo "" >&6; }
diff -upN a/proto.h b/proto.h
--- a/proto.h
+++ b/proto.h
@@ -54,6 +54,7 @@ void set_allow_inc_recurse(void);
void parse_compress_choice(int final_call);
struct name_num_item *get_nni_by_name(struct name_num_obj *nno, const char *name, int len);
struct name_num_item *get_nni_by_num(struct name_num_obj *nno, int num);
+void validate_choice_vs_env(int ntype, int num1, int num2);
int get_default_nno_list(struct name_num_obj *nno, char *to_buf, int to_buf_len, char dup_markup);
void setup_protocol(int f_out,int f_in);
int claim_connection(char *fname, int max_connections);
@@ -186,60 +187,6 @@ int io_end_multiplex_out(int mode);
void start_write_batch(int fd);
void stop_write_batch(void);
void reset_daemon_vars(void);
-char *lp_bind_address(void);
-char *lp_daemon_chroot(void);
-char *lp_daemon_gid(void);
-char *lp_daemon_uid(void);
-char *lp_motd_file(void);
-char *lp_pid_file(void);
-char *lp_socket_options(void);
-int lp_listen_backlog(void);
-int lp_rsync_port(void);
-BOOL lp_proxy_protocol(void);
-char *lp_auth_users(int module_id);
-char *lp_charset(int module_id);
-char *lp_comment(int module_id);
-char *lp_dont_compress(int module_id);
-char *lp_early_exec(int module_id);
-char *lp_exclude(int module_id);
-char *lp_exclude_from(int module_id);
-char *lp_filter(int module_id);
-char *lp_gid(int module_id);
-char *lp_hosts_allow(int module_id);
-char *lp_hosts_deny(int module_id);
-char *lp_include(int module_id);
-char *lp_include_from(int module_id);
-char *lp_incoming_chmod(int module_id);
-char *lp_lock_file(int module_id);
-char *lp_log_file(int module_id);
-char *lp_log_format(int module_id);
-char *lp_name(int module_id);
-char *lp_outgoing_chmod(int module_id);
-char *lp_path(int module_id);
-char *lp_postxfer_exec(int module_id);
-char *lp_prexfer_exec(int module_id);
-char *lp_refuse_options(int module_id);
-char *lp_secrets_file(int module_id);
-char *lp_syslog_tag(int module_id);
-char *lp_temp_dir(int module_id);
-char *lp_uid(int module_id);
-int lp_max_connections(int module_id);
-int lp_max_verbosity(int module_id);
-int lp_syslog_facility(int module_id);
-int lp_timeout(int module_id);
-BOOL lp_fake_super(int module_id);
-BOOL lp_forward_lookup(int module_id);
-BOOL lp_ignore_errors(int module_id);
-BOOL lp_ignore_nonreadable(int module_id);
-BOOL lp_list(int module_id);
-BOOL lp_munge_symlinks(int module_id);
-BOOL lp_numeric_ids(int module_id);
-BOOL lp_read_only(int module_id);
-BOOL lp_reverse_lookup(int module_id);
-BOOL lp_strict_modes(int module_id);
-BOOL lp_transfer_logging(int module_id);
-BOOL lp_use_chroot(int module_id);
-BOOL lp_write_only(int module_id);
int lp_load(char *pszFname, int globals_only);
BOOL set_dparams(int syntax_check_only);
int lp_num_modules(void);
@@ -407,8 +354,8 @@ int flist_ndx_pop(flist_ndx_list *lp);
void *expand_item_list(item_list *lp, size_t item_size, const char *desc, int incr);
void force_memzero(void *buf, size_t len);
int msleep(int t);
-void *_new_array(unsigned long num, unsigned int size, int use_calloc);
-void *_realloc_array(void *ptr, unsigned int size, size_t num);
+char *num_to_byte_string(ssize_t num);
+void *my_alloc(void *ptr, size_t num, size_t size, const char *file, int line);
const char *sum_as_hex(int csum_type, const char *sum, int flist_csum);
NORETURN void out_of_memory(const char *str);
NORETURN void overflow_exit(const char *str);
@@ -434,3 +381,58 @@ int x_fstat(int fd, STRUCT_STAT *fst, ST
int sys_gettimeofday(struct timeval *tv);
char *do_big_num(int64 num, int human_flag, const char *fract);
char *do_big_dnum(double dnum, int human_flag, int decimal_digits);
+char *lp_bind_address(void);
+char *lp_daemon_chroot(void);
+char *lp_daemon_gid(void);
+char *lp_daemon_uid(void);
+char *lp_motd_file(void);
+char *lp_pid_file(void);
+char *lp_socket_options(void);
+int lp_listen_backlog(void);
+int lp_rsync_port(void);
+BOOL lp_proxy_protocol(void);
+char *lp_auth_users(int module_id);
+char *lp_charset(int module_id);
+char *lp_comment(int module_id);
+char *lp_dont_compress(int module_id);
+char *lp_early_exec(int module_id);
+char *lp_exclude(int module_id);
+char *lp_exclude_from(int module_id);
+char *lp_filter(int module_id);
+char *lp_gid(int module_id);
+char *lp_hosts_allow(int module_id);
+char *lp_hosts_deny(int module_id);
+char *lp_include(int module_id);
+char *lp_include_from(int module_id);
+char *lp_incoming_chmod(int module_id);
+char *lp_lock_file(int module_id);
+char *lp_log_file(int module_id);
+char *lp_log_format(int module_id);
+char *lp_name(int module_id);
+char *lp_outgoing_chmod(int module_id);
+char *lp_postxfer_exec(int module_id);
+char *lp_prexfer_exec(int module_id);
+char *lp_refuse_options(int module_id);
+char *lp_secrets_file(int module_id);
+char *lp_syslog_tag(int module_id);
+char *lp_uid(int module_id);
+char *lp_path(int module_id);
+char *lp_temp_dir(int module_id);
+int lp_max_connections(int module_id);
+int lp_max_verbosity(int module_id);
+int lp_timeout(int module_id);
+int lp_syslog_facility(int module_id);
+BOOL lp_fake_super(int module_id);
+BOOL lp_forward_lookup(int module_id);
+BOOL lp_ignore_errors(int module_id);
+BOOL lp_ignore_nonreadable(int module_id);
+BOOL lp_list(int module_id);
+BOOL lp_read_only(int module_id);
+BOOL lp_reverse_lookup(int module_id);
+BOOL lp_strict_modes(int module_id);
+BOOL lp_transfer_logging(int module_id);
+BOOL lp_use_chroot(int module_id);
+BOOL lp_write_only(int module_id);
+BOOL lp_munge_symlinks(int module_id);
+BOOL lp_numeric_ids(int module_id);
+BOOL lp_open_noatime(int module_id);
diff -upN a/rsync-ssl.1 b/rsync-ssl.1
--- a/rsync-ssl.1
+++ b/rsync-ssl.1
@@ -1,4 +1,4 @@
-.TH "rsync-ssl" "1" "22 Jun 2020" "rsync-ssl 3.2.1" "User Commands"
+.TH "rsync-ssl" "1" "04 Jul 2020" "rsync-ssl 3.2.2" "User Commands"
.P
.SH "NAME"
.P
@@ -116,7 +116,7 @@ Please report bugs! See the web site at
.P
.SH "VERSION"
.P
-This man page is current for version 3.2.1 of rsync.
+This man page is current for version 3.2.2 of rsync.
.P
.SH "CREDITS"
.P
diff -upN a/rsync-ssl.1.html b/rsync-ssl.1.html
--- a/rsync-ssl.1.html
+++ b/rsync-ssl.1.html
@@ -106,7 +106,7 @@ exported RSYNC_SSL_TYPE environment vari
BUGS
Please report bugs! See the web site at https://rsync.samba.org/.
VERSION
-This man page is current for version 3.2.1 of rsync.
+This man page is current for version 3.2.2 of rsync.
CREDITS
rsync is distributed under the GNU General Public License. See the file
COPYING for details.
@@ -116,5 +116,5 @@ FAQ-O-Matic which may cover questions un
This manpage was written by Wayne Davison.
Mailing lists for support and development are available at
https://lists.samba.org/.
-
+