[SCM] The rsync repository. - branch master updated

[Rsync CVS commit messages]

The branch, master has been updated
       via  f157ff3b Avoid negotiating a "none" choice by default
      from  d15cfef9 Setup for 3.2.2dev.

https://git.samba.org/?p=rsync.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit f157ff3b3a306153d79d00e9367059c0d1c91ef9
Author: Wayne Davison <wayne at opencoder.net>
Date:   Tue Jun 23 19:14:11 2020 -0700

    Avoid negotiating a "none" choice by default
    
    The client does not pass "none" as a negotiation choice unless it's from
    the user's environment list.  The server still passes the "none" value
    to the client unless its environment var excludes it.

-----------------------------------------------------------------------

Summary of changes:
 compat.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)


Changeset truncated at 500 lines:

diff --git a/compat.c b/compat.c
index 4f225f29..074a86ab 100644
--- a/compat.c
+++ b/compat.c
@@ -379,7 +379,8 @@ void validate_choice_vs_env(int num1, int num2)
 /* The saw buffer is initialized and used to store ordinal values from 1 to N
  * for the order of the args in the array.  If dup_markup == '\0', duplicates
  * are removed otherwise the char is prefixed to the duplicate term and, if it
- * is an opening paren/bracket/brace, the matching closing char is suffixed. */
+ * is an opening paren/bracket/brace, the matching closing char is suffixed.
+ * "none" is removed on the client side unless dup_markup != '\0'. */
 int get_default_nno_list(struct name_num_obj *nno, char *to_buf, int to_buf_len, char dup_markup)
 {
 	struct name_num_item *nni;
@@ -401,6 +402,8 @@ int get_default_nno_list(struct name_num_obj *nno, char *to_buf, int to_buf_len,
 				continue;
 			delim = dup_markup;
 		}
+		if (nni->num == 0 && !am_server && !dup_markup)
+			continue;
 		if (len)
 			to_buf[len++]= ' ';
 		if (delim) {


-- 
The rsync repository.