|
 |
306fa1 |
autofs-5.1.5 - use local getmntent_r in table_is_mounted()
|
|
|
306fa1 |
|
|
|
306fa1 |
From: Ian Kent <raven@themaw.net>
|
|
|
306fa1 |
|
|
|
306fa1 |
Use the local_getmntent_r() funtion copied from glibc in the function
|
|
|
306fa1 |
table_is_mounted() so that if glibc is changed to support the autofs
|
|
|
306fa1 |
"ignore" hint automount(8) won't be affected.
|
|
|
306fa1 |
|
|
|
306fa1 |
Signed-off-by: Ian Kent <raven@themaw.net>
|
|
|
306fa1 |
---
|
|
|
306fa1 |
CHANGELOG | 1 +
|
|
|
306fa1 |
lib/mounts.c | 8 ++++----
|
|
|
306fa1 |
2 files changed, 5 insertions(+), 4 deletions(-)
|
|
|
306fa1 |
|
|
|
306fa1 |
--- autofs-5.0.7.orig/CHANGELOG
|
|
|
306fa1 |
+++ autofs-5.0.7/CHANGELOG
|
|
|
306fa1 |
@@ -341,6 +341,7 @@
|
|
|
306fa1 |
- use mp instead of path in mnt_list entries.
|
|
|
306fa1 |
- always use PROC_MOUNTS to make mount lists.
|
|
|
306fa1 |
- add glibc getmntent_r().
|
|
|
306fa1 |
+- use local getmntent_r in table_is_mounted().
|
|
|
306fa1 |
|
|
|
306fa1 |
25/07/2012 autofs-5.0.7
|
|
|
306fa1 |
=======================
|
|
|
306fa1 |
--- autofs-5.0.7.orig/lib/mounts.c
|
|
|
306fa1 |
+++ autofs-5.0.7/lib/mounts.c
|
|
|
306fa1 |
@@ -1000,14 +1000,14 @@ static int table_is_mounted(const char *
|
|
|
306fa1 |
if (!mp || !mp_len || mp_len >= PATH_MAX)
|
|
|
306fa1 |
return 0;
|
|
|
306fa1 |
|
|
|
306fa1 |
- tab = open_setmntent_r(_PROC_MOUNTS);
|
|
|
306fa1 |
+ tab = open_fopen_r(_PROC_MOUNTS);
|
|
|
306fa1 |
if (!tab) {
|
|
|
306fa1 |
char *estr = strerror_r(errno, buf, PATH_MAX - 1);
|
|
|
306fa1 |
- logerr("setmntent: %s", estr);
|
|
|
306fa1 |
+ logerr("fopen: %s", estr);
|
|
|
306fa1 |
return 0;
|
|
|
306fa1 |
}
|
|
|
306fa1 |
|
|
|
306fa1 |
- while ((mnt = getmntent_r(tab, &mnt_wrk, buf, PATH_MAX * 3))) {
|
|
|
306fa1 |
+ while ((mnt = local_getmntent_r(tab, &mnt_wrk, buf, PATH_MAX * 3))) {
|
|
|
306fa1 |
size_t len = strlen(mnt->mnt_dir);
|
|
|
306fa1 |
|
|
|
306fa1 |
if (type) {
|
|
|
306fa1 |
@@ -1029,7 +1029,7 @@ static int table_is_mounted(const char *
|
|
|
306fa1 |
break;
|
|
|
306fa1 |
}
|
|
|
306fa1 |
}
|
|
|
306fa1 |
- endmntent(tab);
|
|
|
306fa1 |
+ fclose(tab);
|
|
|
306fa1 |
|
|
|
306fa1 |
return ret;
|
|
|
306fa1 |
}
|