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

* Thu Feb 9 2012 Ian Kent <knt@redhat.com> - 1:5.0.6-11

Browse Source 
- fix fuzz in CHANGELOG hunk when applying patch26.
This commit is contained in:
Ian Kent 2012-02-09 18:08:29 +08:00
parent c27a1d8eef
commit 23d379e4b4
2 changed files with 18 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
autofs-5.0.6-teach-automount-about-sss-source.patch
View File

@ -17,23 +17,19 @@ the lookup module.
5 files changed, 8 insertions(+), 4 deletions(-) 5 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG --- autofs-5.0.6.orig/CHANGELOG
index ba6f90c..e276396 100644 +++ autofs-5.0.6/CHANGELOG
--- a/CHANGELOG @@ -22,6 +22,7 @@
+++ b/CHANGELOG
@@ -24,6 +24,7 @@
- fix improve mount location error reporting. - fix improve mount location error reporting.
- fix fix wait for master source mutex. - fix rpc build error.
- add sss lookup module. - add sss lookup module.
+- teach automount about sss source. +- teach automount about sss source.
28/06/2011 autofs-5.0.6 28/06/2011 autofs-5.0.6
----------------------- -----------------------
diff --git a/daemon/lookup.c b/daemon/lookup.c --- autofs-5.0.6.orig/daemon/lookup.c
index 098588c..de7c817 100644 +++ autofs-5.0.6/daemon/lookup.c
--- a/daemon/lookup.c @@ -177,6 +177,7 @@ int lookup_nss_read_master(struct master
+++ b/daemon/lookup.c
@@ -177,6 +177,7 @@ int lookup_nss_read_master(struct master *master, time_t age)
!strncmp(name, "nisplus:", 8) || !strncmp(name, "nisplus:", 8) ||
!strncmp(name, "ldap:", 5) || !strncmp(name, "ldap:", 5) ||
!strncmp(name, "ldaps:", 6) || !strncmp(name, "ldaps:", 6) ||
@ -41,10 +37,8 @@ index 098588c..de7c817 100644
!strncmp(name, "dir:", 4)) { !strncmp(name, "dir:", 4)) {
strncpy(source, name, tmp - name); strncpy(source, name, tmp - name);
diff --git a/lib/master_tok.l b/lib/master_tok.l --- autofs-5.0.6.orig/lib/master_tok.l
index 77e9a26..0d6edb7 100644 +++ autofs-5.0.6/lib/master_tok.l
--- a/lib/master_tok.l
+++ b/lib/master_tok.l
@@ -118,7 +118,7 @@ DNNAMESTR2 ([[:alnum:]_.\-]+) @@ -118,7 +118,7 @@ DNNAMESTR2 ([[:alnum:]_.\-]+)
INTMAP (-hosts|-null) INTMAP (-hosts|-null)
MULTI ((multi)(,(sun|hesiod))?(:{OPTWS}|{WS})) MULTI ((multi)(,(sun|hesiod))?(:{OPTWS}|{WS}))
@ -54,10 +48,8 @@ index 77e9a26..0d6edb7 100644
OPTTOUT (-t{OPTWS}|-t{OPTWS}={OPTWS}|--timeout{OPTWS}|--timeout{OPTWS}={OPTWS}) OPTTOUT (-t{OPTWS}|-t{OPTWS}={OPTWS}|--timeout{OPTWS}|--timeout{OPTWS}={OPTWS})
diff --git a/lib/nss_parse.y b/lib/nss_parse.y --- autofs-5.0.6.orig/lib/nss_parse.y
index 3bda6b3..a39fda4 100644 +++ autofs-5.0.6/lib/nss_parse.y
--- a/lib/nss_parse.y
+++ b/lib/nss_parse.y
@@ -82,7 +82,8 @@ nss_source: SOURCE @@ -82,7 +82,8 @@ nss_source: SOURCE
{ {
if (!strcmp($1, "files") || !strcmp($1, "yp") || if (!strcmp($1, "files") || !strcmp($1, "yp") ||
@ -78,11 +70,9 @@ index 3bda6b3..a39fda4 100644
src = add_source(nss_list, $1); src = add_source(nss_list, $1);
for (a = 0; a < NSS_STATUS_MAX; a++) { for (a = 0; a < NSS_STATUS_MAX; a++) {
if (act[a].action != NSS_ACTION_UNKNOWN) { if (act[a].action != NSS_ACTION_UNKNOWN) {
diff --git a/modules/parse_sun.c b/modules/parse_sun.c --- autofs-5.0.6.orig/modules/parse_sun.c
index e9d94c7..d7e74e2 100644 +++ autofs-5.0.6/modules/parse_sun.c
--- a/modules/parse_sun.c @@ -880,7 +880,7 @@ static int validate_location(unsigned in
+++ b/modules/parse_sun.c
@@ -880,7 +880,7 @@ static int validate_location(unsigned int logopt, char *loc)
!strncmp(ptr, "file:", 5) || !strncmp(ptr, "yp:", 3) || !strncmp(ptr, "file:", 5) || !strncmp(ptr, "yp:", 3) ||
!strncmp(ptr, "nis:", 4) || !strncmp(ptr, "nisplus:", 8) || !strncmp(ptr, "nis:", 4) || !strncmp(ptr, "nisplus:", 8) ||
!strncmp(ptr, "ldap:", 5) || !strncmp(ptr, "ldaps:", 6) || !strncmp(ptr, "ldap:", 5) || !strncmp(ptr, "ldaps:", 6) ||

5
autofs.spec
View File

@ -8,7 +8,7 @@
Summary: A tool for automatically mounting and unmounting filesystems Summary: A tool for automatically mounting and unmounting filesystems
Name: autofs Name: autofs
Version: 5.0.6 Version: 5.0.6
Release: 10%{?dist} Release: 11%{?dist}
Epoch: 1 Epoch: 1
License: GPLv2+ License: GPLv2+
Group: System Environment/Daemons Group: System Environment/Daemons
@ -203,6 +203,9 @@ fi
%dir /etc/auto.master.d %dir /etc/auto.master.d
%changelog %changelog
* Thu Feb 9 2012 Ian Kent <knt@redhat.com> - 1:5.0.6-11
- fix fuzz in CHANGELOG hunk when applying patch26.
* Tue Feb 7 2012 Ian Kent <knt@redhat.com> - 1:5.0.6-10 * Tue Feb 7 2012 Ian Kent <knt@redhat.com> - 1:5.0.6-10
- fix rpc build error. - fix rpc build error.
- add sss lookup module. - add sss lookup module.