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.
51 lines
1.3 KiB
51 lines
1.3 KiB
3 years ago
|
autofs-5.1.8 - dont fail on duplicate host export entry
|
||
|
|
|
||
|
|
From: Ian Kent <raven@themaw.net>
|
||
|
|
|
||
|
|
If we encounter a duplicate host export entry don't fail, just ignore
|
||
|
|
it and return the duplicate.
|
||
|
|
|
||
|
|
Signed-off-by: Ian Kent <raven@themaw.net>
|
||
|
|
---
|
||
|
|
CHANGELOG | 1 +
|
||
|
|
lib/mounts.c | 6 ++++--
|
||
|
|
2 files changed, 5 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/CHANGELOG b/CHANGELOG
|
||
|
|
index bd1f672c..aaf20cd6 100644
|
||
|
|
--- a/CHANGELOG
|
||
|
|
+++ b/CHANGELOG
|
||
|
|
@@ -5,6 +5,7 @@
|
||
|
|
- fix root offset error handling.
|
||
|
|
- fix fix root offset error handling.
|
||
|
|
- fix nonstrict fail handling of last offset mount.
|
||
|
|
+- dont fail on duplicate offset entry tree add.
|
||
|
|
|
||
|
|
19/10/2021 autofs-5.1.8
|
||
|
|
- add xdr_exports().
|
||
|
|
diff --git a/lib/mounts.c b/lib/mounts.c
|
||
|
|
index b4229908..451849a6 100644
|
||
|
|
--- a/lib/mounts.c
|
||
|
|
+++ b/lib/mounts.c
|
||
|
|
@@ -1341,7 +1341,7 @@ static struct tree_node *tree_add_node(struct tree_node *root, void *ptr)
|
||
|
|
}
|
||
|
|
|
||
|
|
if (!eq)
|
||
|
|
- error(LOGOPT_ANY, "cannot add duplicate entry to tree");
|
||
|
|
+ return p;
|
||
|
|
else {
|
||
|
|
if (eq < 0)
|
||
|
|
return tree_add_left(p, ptr);
|
||
|
|
@@ -1515,8 +1515,10 @@ static int tree_host_cmp(struct tree_node *n, void *ptr)
|
||
|
|
int eq;
|
||
|
|
|
||
|
|
eq = strcmp(exp->dir, n_exp->dir);
|
||
|
|
- if (!eq)
|
||
|
|
+ if (!eq) {
|
||
|
|
+ error(LOGOPT_ANY, "duplicate entry %s ignored", exp->dir);
|
||
|
|
return 0;
|
||
|
|
+ }
|
||
|
|
return (exp_len < n_exp_len) ? -1 : 1;
|
||
|
|
}
|
||
|
|
|