rpms/autofs
7
0
Fork 0
Code Issues Pull Requests Releases Activity

- rename program map parsing bug fix patch.

Browse Source 
- use CLOEXEC flag functionality for setmntent also, if present.
This commit is contained in:
Ian Kent 2009-02-05 06:42:21 +00:00
parent 1d2ef99973
commit 9a5a39f9f2
4 changed files with 131 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
autofs-5.0.4-fix-program-map-quoted-output.patch
View File

@ -1,11 +0,0 @@
diff -up autofs-5.0.4/modules/lookup_program.c.orig autofs-5.0.4/modules/lookup_program.c
--- autofs-5.0.4/modules/lookup_program.c.orig 2009-01-21 14:33:50.000000000 -0500
+++ autofs-5.0.4/modules/lookup_program.c 2009-01-21 14:39:35.113105023 -0500
@@ -341,6 +341,7 @@ cont:
/* Eat characters till there's no more output */
break;
}
+ quoted = 0;
goto cont;
}
quoted = 0;

34
autofs-5.0.4-fix-quoted-mess.patch Normal file
View File

@ -0,0 +1,34 @@
autofs-5.0.4 - clear the quoted flag after each character
From: Jeff Moyer <jmoyer@redhat.com>
This regression was introduced by autofs-5.0.4-fix-select-fd-limit.patch.
The fix is to clear the quoted flag after processing each character from
program map input.
---
CHANGELOG | 1 +
modules/lookup_program.c | 1 +
2 files changed, 2 insertions(+)
--- autofs-5.0.4.orig/CHANGELOG
+++ autofs-5.0.4/CHANGELOG
@@ -7,6 +7,7 @@
- fix select(2) fd limit.
- make hash table scale to thousands of entries (Paul Wankadia,
Valerie Aurora Henson).
+- clear the quoted flag after each character from program map input.
4/11/2008 autofs-5.0.4
-----------------------
--- autofs-5.0.4.orig/modules/lookup_program.c
+++ autofs-5.0.4/modules/lookup_program.c
@@ -341,6 +341,7 @@ cont:
/* Eat characters till there's no more output */
break;
}
+ quoted = 0;
goto cont;
}
quoted = 0;

90
autofs-5.0.4-use-CLOEXEC-flag-setmntent.patch Normal file
View File

@ -0,0 +1,90 @@
autofs-5.0.4 - use CLOEXEC flag for setmntent
From: Ian Kent <raven@themaw.net>
Update use of CLOEXEC functionality to cover setmntent(3)
calls as well.
---
CHANGELOG | 1 +
include/automount.h | 20 ++++++++++++++++++++
lib/mounts.c | 8 ++++----
3 files changed, 25 insertions(+), 4 deletions(-)
--- autofs-5.0.4.orig/CHANGELOG
+++ autofs-5.0.4/CHANGELOG
@@ -8,6 +8,7 @@
- make hash table scale to thousands of entries (Paul Wankadia,
Valerie Aurora Henson).
- clear the quoted flag after each character from program map input.
+- use CLOEXEC flag for setmntent also.
4/11/2008 autofs-5.0.4
-----------------------
--- autofs-5.0.4.orig/include/automount.h
+++ autofs-5.0.4/include/automount.h
@@ -581,5 +581,25 @@ static inline FILE *open_fopen_r(const c
return f;
}
+static inline FILE *open_setmntent_r(const char *table)
+{
+ FILE *tab;
+
+#if defined(O_CLOEXEC) && defined(SOCK_CLOEXEC)
+ if (cloexec_works != -1) {
+ tab = setmntent(table, "re");
+ if (tab != NULL) {
+ check_cloexec(fileno(tab));
+ return tab;
+ }
+ }
+#endif
+ tab = fopen(table, "r");
+ if (tab == NULL)
+ return NULL;
+ check_cloexec(fileno(tab));
+ return tab;
+}
+
#endif
--- autofs-5.0.4.orig/lib/mounts.c
+++ autofs-5.0.4/lib/mounts.c
@@ -218,7 +218,7 @@ struct mnt_list *get_mnt_list(const char
if (!path || !pathlen || pathlen > PATH_MAX)
return NULL;
- tab = setmntent(table, "r");
+ tab = open_setmntent_r(table);
if (!tab) {
char *estr = strerror_r(errno, buf, PATH_MAX - 1);
logerr("setmntent: %s", estr);
@@ -415,7 +415,7 @@ static int table_is_mounted(const char *
if (!path || !pathlen || pathlen >= PATH_MAX)
return 0;
- tab = setmntent(table, "r");
+ tab = open_setmntent_r(table);
if (!tab) {
char *estr = strerror_r(errno, buf, PATH_MAX - 1);
logerr("setmntent: %s", estr);
@@ -489,7 +489,7 @@ int has_fstab_option(const char *opt)
if (!opt)
return 0;
- tab = setmntent(_PATH_MNTTAB, "r");
+ tab = open_setmntent_r(_PATH_MNTTAB);
if (!tab) {
char *estr = strerror_r(errno, buf, PATH_MAX - 1);
logerr("setmntent: %s", estr);
@@ -668,7 +668,7 @@ struct mnt_list *tree_make_mnt_tree(cons
size_t plen;
int eq;
- tab = setmntent(table, "r");
+ tab = open_setmntent_r(table);
if (!tab) {
char *estr = strerror_r(errno, buf, PATH_MAX - 1);
logerr("setmntent: %s", estr);

9
autofs.spec
View File

@ -4,7 +4,7 @@
Summary: A tool for automatically mounting and unmounting filesystems
Name: autofs
Version: 5.0.4
Release: 6
Release: 7
Epoch: 1
License: GPLv2+
Group: System Environment/Daemons
@ -17,7 +17,8 @@ Patch4: autofs-5.0.4-fix-ldap-detection.patch
Patch5: autofs-5.0.4-use-CLOEXEC-flag.patch
Patch6: autofs-5.0.4-fix-select-fd-limit.patch
Patch7: autofs-5.0.4-make-hash-table-scale-to-thousands-of-entries.patch
Patch8: autofs-5.0.4-fix-program-map-quoted-output.patch
Patch8: autofs-5.0.4-fix-quoted-mess.patch
Patch9: autofs-5.0.4-use-CLOEXEC-flag-setmntent.patch
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: autoconf, hesiod-devel, openldap-devel, bison, flex, libxml2-devel, cyrus-sasl-devel, openssl-devel module-init-tools util-linux nfs-utils e2fsprogs
Requires: kernel >= 2.6.17
@ -119,6 +120,10 @@ fi
%{_libdir}/autofs/
%changelog
* Wed Jan 21 2009 Jeff Moyer <jmoyer@redhat.com> - 5.0.4-7
- rename program map parsing bug fix patch.
- use CLOEXEC flag functionality for setmntent also, if present.
* Wed Jan 21 2009 Jeff Moyer <jmoyer@redhat.com> - 5.0.4-6
- fix a bug in the program map parsing routine