Merge fix from master regarding lpstat hanging

Master commit:
https://github.com/OpenPrinting/cups/commit/3f763a960f3

Fixes #773

diff --git a/CHANGES.md b/CHANGES.md
index 23dbb6e1b3812a097fd4c62277e1f0e338947554..5832cd13d2ea63a50ae773cd87ab3a0c0f62b758 100644 (file)
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -7,6 +7,7 @@ Changes in CUPS v2.4.7 (TBA)
 - Added OpenSSL support for cupsHashData (Issue #762)
 - Fixed delays in lpd backend (Issue #741)
 - Fixed extensive logging in scheduler (Issue #604)
+- Fixed hanging of `lpstat` on IBM AIX (Issue #773)
 - Fixed printing to stderr if we can't open cups-files.conf (Issue #777)
 - Fixed purging job files via `cancel -x` (Issue #742)
 - Fixed a bug in the PPD command interpretation code (Issue #768)

diff --git a/cups/request.c b/cups/request.c
index 66c803a04c7c98d60e7e63ddbe013e33bbf42d81..4526dd687f0f6c271a9a0d77bebb69dbdc509ee3 100644 (file)
--- a/cups/request.c
+++ b/cups/request.c
@@ -25,9 +25,11 @@
 #ifndef O_BINARY
 #  define O_BINARY 0
 #endif /* O_BINARY */
-#ifndef MSG_DONTWAIT
+#ifdef _AIX
+#  define MSG_DONTWAIT MSG_NONBLOCK
+#elif !defined(MSG_DONTWAIT)
 #  define MSG_DONTWAIT 0
-#endif /* !MSG_DONTWAIT */
+#endif /* _AIX */
 
 
 /*

diff --git a/scheduler/log.c b/scheduler/log.c
index 8aafb66b723f38fe6b757c82570bcff48f302176..8a2996e30dfb94dc21c412b6dda0f78057d18044 100644 (file)
--- a/scheduler/log.c
+++ b/scheduler/log.c
@@ -22,6 +22,9 @@
 #  include <systemd/sd-journal.h>
 #endif /* HAVE_ASL_H */
 #include <syslog.h>
+#ifndef va_copy
+#  define va_copy(__list1, __list2) ((void)(__list1 = __list2))
+#endif
 
 
 /*