autofs-5.1.9 - fix multiply defined proximity From: Ian Kent The proximity defines have been added in two places so remove one of the definintions. Signed-off-by: Ian Kent --- CHANGELOG | 1 + include/automount.h | 1 + include/parse_subs.h | 7 ------- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 4bbb7d177..14a31e2a9 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -49,6 +49,7 @@ - fix incorrect allocation in match_key(). - dont use alloca for nfsoptions. - fix type mismatch in mount_autofs_direct(). +- fix multiply defined proximity. 02/11/2023 autofs-5.1.9 - fix kernel mount status notification. diff --git a/include/automount.h b/include/automount.h index 79a375512..fd7219d52 100644 --- a/include/automount.h +++ b/include/automount.h @@ -33,6 +33,7 @@ #include "log.h" #include "mounts.h" #include "rpc_subs.h" +#include "replicated.h" #include "parse_subs.h" #include "dev-ioctl-lib.h" #include "parse_amd.h" diff --git a/include/parse_subs.h b/include/parse_subs.h index 3768275a9..b33b99f5d 100644 --- a/include/parse_subs.h +++ b/include/parse_subs.h @@ -18,13 +18,6 @@ #ifndef PARSE_SUBS_H #define PARSE_SUBS_H -#define PROXIMITY_ERROR 0x0000 -#define PROXIMITY_LOCAL 0x0001 -#define PROXIMITY_SUBNET 0x0002 -#define PROXIMITY_NET 0x0004 -#define PROXIMITY_OTHER 0x0008 -#define PROXIMITY_UNSUPPORTED 0x0010 - #define SEL_ARCH 0x00000001 #define SEL_KARCH 0x00000002 #define SEL_OS 0x00000004