← Back to branch summary

~ubuntu-branches/ubuntu/precise/autofs5/precise

« back to all changes in this revision

Viewing changes to debian/patches/autofs-5.0.5-remove-extra-read-master-map-call.patch

  • Committer: Bazaar Package Importer
  • Author(s): Chuck Short
  • Date: 2011-07-03 14:35:46 UTC
  • mfrom: (1.1.3 upstream)
  • Revision ID: james.westby@ubuntu.com-20110703143546-nej26krjij0rf792
Tags: 5.0.6-0ubuntu1
* New upstream release:
  - Dropped upstream patches 
  - Refreshed debian/patches/17ld.patch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/autofs-5.0.5-remove-extra-read-master-map-call.patch
1
 
autofs-5.0.5 - remove extra read master map call
2
 
 
3
 
From: Ian Kent <raven@themaw.net>
4
 
 
5
 
Fix a mistake with a recent patch where a call to lookup_read_master()
6
 
which should have been removed wasn't.
7
 
---
8
 
 
9
 
 CHANGELOG    |    1 +
10
 
 lib/master.c |    1 -
11
 
 2 files changed, 1 insertions(+), 1 deletions(-)
12
 
 
13
 
 
14
 
diff --git a/CHANGELOG b/CHANGELOG
15
 
index a998a67..e5d743b 100644
16
 
--- a/CHANGELOG
17
 
+++ b/CHANGELOG
18
 
@@ -44,6 +44,7 @@
19
 
 - check each dc server individually.
20
 
 - fix negative cache included map lookup.
21
 
 - remove state machine timed wait.
22
 
+- remove extra read master map call.
23
 
 
24
 
 03/09/2009 autofs-5.0.5
25
 
 -----------------------
26
 
diff --git a/lib/master.c b/lib/master.c
27
 
index 62d6fc0..03d8f77 100644
28
 
--- a/lib/master.c
29
 
+++ b/lib/master.c
30
 
@@ -840,7 +840,6 @@ int master_read_master(struct master *master, time_t age, int readall)
31
 
        lookup_nss_read_master(master, age);
32
 
        cache_unlock(nc);
33
 
 
34
 
-       lookup_nss_read_master(master, age);
35
 
        if (!master->read_fail)
36
 
                master_mount_mounts(master, age, readall);
37
 
        else {