From 232f39bb9c00771f4d0e38911a524a8d82417c08 Mon Sep 17 00:00:00 2001 From: Packit Service Date: Dec 09 2020 08:03:55 +0000 Subject: Apply patch autofs-5.1.4-fix-sublink-option-not-set-from-defaults.patch patch_name: autofs-5.1.4-fix-sublink-option-not-set-from-defaults.patch present_in_specfile: true --- diff --git a/CHANGELOG b/CHANGELOG index 19aec2a..756ef92 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -5,6 +5,7 @@ xx/xx/2018 autofs-5.1.5 - fix deadlock in dumpmaps. - dont use array for path when not necessary. - fix prefix option handling in expand_entry(). +- fix sublink option not set from defaults. 19/12/2017 autofs-5.1.4 - fix spec file url. diff --git a/modules/parse_amd.c b/modules/parse_amd.c index 1a5a296..1c962ff 100644 --- a/modules/parse_amd.c +++ b/modules/parse_amd.c @@ -645,6 +645,18 @@ static void update_with_defaults(struct amd_entry *defaults, } } + if (!entry->sublink) { + if (defaults->sublink) { + tmp = strdup(defaults->sublink); + if (tmp) + entry->sublink = tmp; + } else { + v = macro_findvar(sv, "sublink", 2); + if (v) + entry->sublink = strdup(v->val); + } + } + return; }