|
 |
304803 |
autofs-5.1.0 - fix fix master map type check
|
|
|
304803 |
|
|
|
304803 |
From: Ian Kent <ikent@redhat.com>
|
|
|
304803 |
|
|
|
304803 |
The map type is of the form <type>[,<format>] but the master map type
|
|
|
304803 |
check for the old style map syntax wasn't allowing for <format> to be
|
|
|
304803 |
given (see commit 7c104167).
|
|
|
304803 |
|
|
|
304803 |
When fixing this an incorrect length was accidently used when checking
|
|
|
304803 |
for the "yp" map type which causes it to never match.
|
|
|
304803 |
---
|
|
|
304803 |
CHANGELOG | 1 +
|
|
|
304803 |
daemon/lookup.c | 4 ++--
|
|
|
304803 |
2 files changed, 3 insertions(+), 2 deletions(-)
|
|
|
304803 |
|
|
|
304803 |
--- autofs-5.0.7.orig/CHANGELOG
|
|
|
304803 |
+++ autofs-5.0.7/CHANGELOG
|
|
|
304803 |
@@ -156,6 +156,7 @@
|
|
|
304803 |
- ignore multiple commas in options strings.
|
|
|
304803 |
- clarify multiple mounts description.
|
|
|
304803 |
- update man page autofs(8) for systemd.
|
|
|
304803 |
+- fix fix master map type check.
|
|
|
304803 |
|
|
|
304803 |
25/07/2012 autofs-5.0.7
|
|
|
304803 |
=======================
|
|
|
304803 |
--- autofs-5.0.7.orig/daemon/lookup.c
|
|
|
304803 |
+++ autofs-5.0.7/daemon/lookup.c
|
|
|
304803 |
@@ -233,8 +233,8 @@ int lookup_nss_read_master(struct master
|
|
|
304803 |
memset(source, 0, 10);
|
|
|
304803 |
if ((!strncmp(name, "file", 4) &&
|
|
|
304803 |
(name[4] == ',' || name[4] == ':')) ||
|
|
|
304803 |
- (!strncmp(name, "yp", 3) &&
|
|
|
304803 |
- (name[3] == ',' || name[3] == ':')) ||
|
|
|
304803 |
+ (!strncmp(name, "yp", 2) &&
|
|
|
304803 |
+ (name[2] == ',' || name[2] == ':')) ||
|
|
|
304803 |
(!strncmp(name, "nis", 3) &&
|
|
|
304803 |
(name[3] == ',' || name[3] == ':')) ||
|
|
|
304803 |
(!strncmp(name, "nisplus", 7) &&
|