You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
56 lines
1.8 KiB
56 lines
1.8 KiB
7 years ago
|
autofs-5.0.7 - fix host_addr null reference in add_new_host()
|
||
|
|
|
||
|
|
From: Ian Kent <raven@themaw.net>
|
||
|
|
|
||
|
|
The function add_new_host() is always called from a loop that depends
|
||
|
|
on host_addr being non-null.
|
||
|
|
|
||
|
|
Remove the redundant check.
|
||
|
|
---
|
||
|
|
modules/replicated.c | 29 ++++++++++-------------------
|
||
|
|
1 file changed, 10 insertions(+), 19 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/modules/replicated.c b/modules/replicated.c
|
||
|
|
index 0a044b9..e793ca4 100644
|
||
|
|
--- a/modules/replicated.c
|
||
|
|
+++ b/modules/replicated.c
|
||
|
|
@@ -1030,28 +1030,19 @@ static int add_new_host(struct host **list,
|
||
|
|
unsigned int prx;
|
||
|
|
int addr_len;
|
||
|
|
|
||
|
|
+ prx = get_proximity(host_addr->ai_addr);
|
||
|
|
+
|
||
|
|
/*
|
||
|
|
- * If we are using random selection we pretend all hosts are at
|
||
|
|
- * the same proximity so hosts further away don't get excluded.
|
||
|
|
- * We can't use PROXIMITY_LOCAL or we won't perform an RPC ping
|
||
|
|
- * to remove hosts that may be down.
|
||
|
|
+ * If we want the weight to be the determining factor
|
||
|
|
+ * when selecting a host, or we are using random selection,
|
||
|
|
+ * then all hosts must have the same proximity. However,
|
||
|
|
+ * if this is the local machine it should always be used
|
||
|
|
+ * since it is certainly available.
|
||
|
|
*/
|
||
|
|
- if (!host_addr)
|
||
|
|
+ if (prx != PROXIMITY_LOCAL &&
|
||
|
|
+ (options & (MOUNT_FLAG_USE_WEIGHT_ONLY |
|
||
|
|
+ MOUNT_FLAG_RANDOM_SELECT)))
|
||
|
|
prx = PROXIMITY_SUBNET;
|
||
|
|
- else {
|
||
|
|
- prx = get_proximity(host_addr->ai_addr);
|
||
|
|
- /*
|
||
|
|
- * If we want the weight to be the determining factor
|
||
|
|
- * when selecting a host, or we are using random selection,
|
||
|
|
- * then all hosts must have the same proximity. However,
|
||
|
|
- * if this is the local machine it should always be used
|
||
|
|
- * since it is certainly available.
|
||
|
|
- */
|
||
|
|
- if (prx != PROXIMITY_LOCAL &&
|
||
|
|
- (options & (MOUNT_FLAG_USE_WEIGHT_ONLY |
|
||
|
|
- MOUNT_FLAG_RANDOM_SELECT)))
|
||
|
|
- prx = PROXIMITY_SUBNET;
|
||
|
|
- }
|
||
|
|
|
||
|
|
/*
|
||
|
|
* If we tried to add an IPv6 address and we don't have IPv6
|