diff options
Diffstat (limited to 'meta-networking/recipes-daemons/autofs/autofs-5.0.7/autofs-5.0.7-allow-nsswitch_conf-to-not-contain-automount-lines.patch')
-rw-r--r-- | meta-networking/recipes-daemons/autofs/autofs-5.0.7/autofs-5.0.7-allow-nsswitch_conf-to-not-contain-automount-lines.patch | 50 |
1 files changed, 50 insertions, 0 deletions
diff --git a/meta-networking/recipes-daemons/autofs/autofs-5.0.7/autofs-5.0.7-allow-nsswitch_conf-to-not-contain-automount-lines.patch b/meta-networking/recipes-daemons/autofs/autofs-5.0.7/autofs-5.0.7-allow-nsswitch_conf-to-not-contain-automount-lines.patch new file mode 100644 index 0000000000..c342d1072e --- /dev/null +++ b/meta-networking/recipes-daemons/autofs/autofs-5.0.7/autofs-5.0.7-allow-nsswitch_conf-to-not-contain-automount-lines.patch | |||
@@ -0,0 +1,50 @@ | |||
1 | autofs-5.0.7 - Allow nsswitch.conf to not contain "automount:" lines | ||
2 | |||
3 | From: Michael Tokarev <mjt@tls.msk.ru> | ||
4 | |||
5 | Current code does not allow a case when nsswitch.conf | ||
6 | does not mention automount map at all, like all new | ||
7 | installations. It logs a rather unpleasant error | ||
8 | message instead: | ||
9 | |||
10 | syntax error in nsswitch config near [ syntax error ] | ||
11 | |||
12 | this patch has a minimal fix, to allo "file" to be empty. | ||
13 | |||
14 | Whole parser in C is about 25 lines of code, the "grammar" | ||
15 | is trivial, and it is better to ditch all this yacc/lex | ||
16 | stuff, but that will be much more intrusive change. | ||
17 | |||
18 | Signed-off-by: Michael Tokarev <mjt@tls.msk.ru> | ||
19 | Cc: 682266@bugs.debian.org | ||
20 | --- | ||
21 | |||
22 | CHANGELOG | 1 + | ||
23 | lib/nss_parse.y | 1 + | ||
24 | 2 files changed, 2 insertions(+), 0 deletions(-) | ||
25 | |||
26 | |||
27 | diff --git a/CHANGELOG b/CHANGELOG | ||
28 | index bd0dd82..16ac2a0 100644 | ||
29 | --- a/CHANGELOG | ||
30 | +++ b/CHANGELOG | ||
31 | @@ -16,6 +16,7 @@ | ||
32 | - increase file map read buffer size. | ||
33 | - handle new location of systemd. | ||
34 | - fix map entry duplicate offset detection. | ||
35 | +- Allow nsswitch.conf to not contain "automount:" lines. | ||
36 | |||
37 | 25/07/2012 autofs-5.0.7 | ||
38 | ======================= | ||
39 | diff --git a/lib/nss_parse.y b/lib/nss_parse.y | ||
40 | index a39fda4..055e9d7 100644 | ||
41 | --- a/lib/nss_parse.y | ||
42 | +++ b/lib/nss_parse.y | ||
43 | @@ -72,6 +72,7 @@ file: { | ||
44 | nss_debug = YYDEBUG; | ||
45 | #endif | ||
46 | } sources NL | ||
47 | + | /* empty */ | ||
48 | ; | ||
49 | |||
50 | sources: nss_source | ||