[SCM] The rsync repository. - branch master updated

[Rsync CVS commit messages]

The branch, master has been updated
       via  2598ca66 Fix the default skip-compress list.
       via  cd7ad50b Tweak the grep to look for sys/sysmacros.h.
      from  5e4a1441 Avoid the include warnings for major().

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


- Log -----------------------------------------------------------------
commit 2598ca668b739c50f4206c06dc1c8d3a561b0866
Author: Wayne Davison <wayned at samba.org>
Date:   Tue Apr 7 18:08:05 2020 -0700

    Fix the default skip-compress list.
    
    The default value of the skip-compress list actually comes from the
    daemon's default lp_dont_compress() value, but a while back the vars
    stopped getting default values in a non-daemon run. I added a call to
    reset_daemon_vars() so that the "Vars" values get set from "Defaults".

commit cd7ad50bc85e7696724da59f2689ef2050e41189
Author: Wayne Davison <wayned at samba.org>
Date:   Tue Apr 7 15:32:06 2020 -0700

    Tweak the grep to look for sys/sysmacros.h.

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

Summary of changes:
 loadparm.c               | 4 ++--
 m4/header_major_fixed.m4 | 2 +-
 main.c                   | 4 ++++
 3 files changed, 7 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/loadparm.c b/loadparm.c
index 029f358f..534e7b63 100644
--- a/loadparm.c
+++ b/loadparm.c
@@ -449,7 +449,7 @@ static struct parm_struct parm_table[] =
 };
 
 /* Initialise the Default all_vars structure. */
-static void reset_all_vars(void)
+void reset_daemon_vars(void)
 {
 	memcpy(&Vars, &Defaults, sizeof Vars);
 }
@@ -872,7 +872,7 @@ int lp_load(char *pszFname, int globals_only)
 {
 	bInGlobalSection = True;
 
-	reset_all_vars();
+	reset_daemon_vars();
 
 	/* We get sections first, so have to start 'behind' to make up. */
 	iSectionIndex = -1;
diff --git a/m4/header_major_fixed.m4 b/m4/header_major_fixed.m4
index 395889cd..0f156aa0 100644
--- a/m4/header_major_fixed.m4
+++ b/m4/header_major_fixed.m4
@@ -3,7 +3,7 @@ AC_DEFUN([AC_HEADER_MAJOR_FIXED],
 		ac_cv_header_sys_types_h_makedev,
 [AC_LINK_IFELSE([AC_LANG_PROGRAM([[@%:@include <sys/types.h>]],
 				 [[return makedev(0, 0);]])],
-		[if grep 'historical compatibility' conftest.err >/dev/null; then
+		[if grep sys/sysmacros.h conftest.err >/dev/null; then
 		   ac_cv_header_sys_types_h_makedev=no
 		 else
 		   ac_cv_header_sys_types_h_makedev=yes
diff --git a/main.c b/main.c
index 1328c504..9af9e5d3 100644
--- a/main.c
+++ b/main.c
@@ -1681,6 +1681,10 @@ int main(int argc,char *argv[])
 
 	memset(&stats, 0, sizeof(stats));
 
+	/* Even a non-daemon runs needs the default config values to be set, e.g.
+	 * lp_dont_compress() is queried when no --skip-compress option is set. */
+	reset_daemon_vars();
+
 	if (argc < 2) {
 		usage(FERROR);
 		exit_cleanup(RERR_SYNTAX);


-- 
The rsync repository.