Merge branch 'maint-0.3.1' into maint-0.3.2

diff --cc src/common/compat.c
index 7fe97488e3aad136428a758c13741cc173012678,4a1f0013c67344981070f6604465feef51fbce3b..83bb707e17f38f5e30cabe0b096c82892939cec4
--- 1/src/common/compat.c
--- 2/src/common/compat.c
+++ b/src/common/compat.c
@@@ -1753,14 -1752,13 +1754,13 @@@ set_max_file_descriptors(rlim_t limit, 
                     (unsigned long)try_limit, (unsigned long)OPEN_MAX,
                     (unsigned long)rlim.rlim_max);
          }
-         bad = 0;
+         couldnt_set = 0;
        }
      }
 -#endif /* OPEN_MAX */
 +#endif /* defined(OPEN_MAX) */
-     if (bad) {
+     if (couldnt_set) {
        log_warn(LD_CONFIG,"Couldn't set maximum number of file descriptors: %s",
-                strerror(errno));
-       return -1;
+                strerror(setrlimit_errno));
      }
    }
    /* leave some overhead for logs, etc, */