← Back to branch summary

~ubuntu-branches/ubuntu/quantal/dovecot/quantal

« back to all changes in this revision

Viewing changes to debian/patches/fix-dovecot-config-parser.patch

  • Committer: Bazaar Package Importer
  • Author(s): Chuck Short
  • Date: 2010-06-24 14:09:05 UTC
  • Revision ID: james.westby@ubuntu.com-20100624140905-xemvyhef941m9k94
Tags: 1:1.2.12-0ubuntu3
https://launchpad.net/bugs/597818
debian/patches/fix-dovecot-config-parser.patch: Fix ordering of external config 
files. (LP: #597818) 

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/fix-dovecot-config-parser.patch
 
1
Index: dovecot-1.2.12/src/lib-settings/settings.c
 
2
===================================================================
 
3
--- dovecot-1.2.12.orig/src/lib-settings/settings.c     2010-06-24 14:08:02.274875086 -0400
 
4
+++ dovecot-1.2.12/src/lib-settings/settings.c  2010-06-24 14:08:25.374248317 -0400
 
5
@@ -153,8 +153,8 @@
 
6
        }
 
7
 
 
8
        /* iterate throuth the different files matching the globbing */
 
9
-       for (i = 0; i < globbers.gl_pathc; i++) {
 
10
-               if (settings_add_include(globbers.gl_pathv[i], inputp,
 
11
+       for (i = globbers.gl_pathc; i > 0 ; i--) {
 
12
+               if (settings_add_include(globbers.gl_pathv[i-1], inputp,
 
13
                                         ignore_errors, error_r) < 0)
 
14
                        return -1;
 
15
        }