[Pkg-gnupg-commit] [gpgme] 28/412: Fix possible _SC_OPEN_MAX max problem on AIX.

Daniel Kahn Gillmor dkg at fifthhorseman.net
Thu Sep 22 21:26:08 UTC 2016


This is an automated email from the git hooks/post-receive script.

dkg pushed a commit to branch master
in repository gpgme.

commit e79199468ac54ce4fe919603ff7bada97267174f
Author: Werner Koch <wk at gnupg.org>
Date:   Fri Jan 15 16:16:38 2016 +0100

    Fix possible _SC_OPEN_MAX max problem on AIX.
    
    * src/posix-io.c [HAVE_STDINT_H]: Include stdint.h.
    (get_max_fds): Limit returned value for too high values.
    --
    
    Signed-off-by: Werner Koch <wk at gnupg.org>
---
 src/posix-io.c | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/src/posix-io.c b/src/posix-io.c
index ac823fc..e49c71e 100644
--- a/src/posix-io.c
+++ b/src/posix-io.c
@@ -23,6 +23,9 @@
 #endif
 #include <stdio.h>
 #include <stdlib.h>
+#ifdef HAVE_STDINT_H
+# include <stdint.h>
+#endif
 #include <string.h>
 #include <assert.h>
 #include <errno.h>
@@ -331,6 +334,16 @@ get_max_fds (void)
       fds = 1024;
     }
 
+  /* AIX returns INT32_MAX instead of a proper value.  We assume that
+   * this is always an error and use a more reasonable limit.  */
+#ifdef INT32_MAX
+  if (fds == INT32_MAX)
+    {
+      source = "aix-fix";
+      fds = 1024;
+    }
+#endif
+
   TRACE2 (DEBUG_SYSIO, "gpgme:max_fds", 0, "max fds=%i (%s)", fds, source);
   return fds;
 }

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gpgme.git



More information about the Pkg-gnupg-commit mailing list