From 66a87269d11d55dc6b348a94a37b9176c4449bd0 Mon Sep 17 00:00:00 2001
From: Werner Koch <wk@gnupg.org>
Date: Mon, 19 Apr 2004 14:25:24 +0000
Subject: * assuan-socket-server.c, assuan-socket-connect.c: Includes
 sys/types.h.  Reported by Michael Nottebrock. * assuan-domain-connect.c:
 Ditto.

---
 src/ChangeLog               | 11 +++++++++++
 src/assuan-domain-connect.c |  1 +
 src/assuan-socket-connect.c |  1 +
 src/assuan-socket-server.c  |  1 +
 src/assuan-util.c           |  4 ++--
 5 files changed, 16 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/ChangeLog b/src/ChangeLog
index f172e56..c84b161 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,14 @@
+2004-04-19  Werner Koch  <wk@gnupg.org>
+
+	* assuan-socket-server.c, assuan-socket-connect.c: Includes
+	sys/types.h.  Reported by Michael Nottebrock.
+	* assuan-domain-connect.c: Ditto.
+
+2004-04-13  Werner Koch  <wk@gnupg.org>
+
+	* assuan-util.c (_assuan_log_print_buffer): Relaxed quoting.
+	(_assuan_log_sanitized_string): Ditto.
+
 2004-03-14  Werner Koch  <wk@gnupg.org>
 
 	* assuan-handler.c: Include <errno.h>.  Reported by Bernd Kuhls.
diff --git a/src/assuan-domain-connect.c b/src/assuan-domain-connect.c
index fbcd241..ea35ba0 100644
--- a/src/assuan-domain-connect.c
+++ b/src/assuan-domain-connect.c
@@ -26,6 +26,7 @@
 #include <stddef.h>
 #include <stdio.h>
 #include <errno.h>
+#include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/un.h>
 #include <unistd.h>
diff --git a/src/assuan-socket-connect.c b/src/assuan-socket-connect.c
index 020ca1c..6ce3f9c 100644
--- a/src/assuan-socket-connect.c
+++ b/src/assuan-socket-connect.c
@@ -23,6 +23,7 @@
 #include <stddef.h>
 #include <stdio.h>
 #include <errno.h>
+#include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/un.h>
 #include <unistd.h>
diff --git a/src/assuan-socket-server.c b/src/assuan-socket-server.c
index 8d23a6b..d92e6e4 100644
--- a/src/assuan-socket-server.c
+++ b/src/assuan-socket-server.c
@@ -22,6 +22,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <errno.h>
+#include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/un.h>
 #include <unistd.h>
diff --git a/src/assuan-util.c b/src/assuan-util.c
index a09982a..e746d1e 100644
--- a/src/assuan-util.c
+++ b/src/assuan-util.c
@@ -134,7 +134,7 @@ _assuan_log_print_buffer (FILE *fp, const void *buffer, size_t length)
   int n;
 
   for (n=length,s=buffer; n; n--, s++)
-    if  (!isascii (*s) || iscntrl (*s) || !isprint (*s))
+    if  ((!isascii (*s) || iscntrl (*s) || !isprint (*s)) && !(*s >= 0x80))
       break;
 
   s = buffer;
@@ -198,7 +198,7 @@ _assuan_log_sanitized_string (const char *string)
 	  break;
 
 	default:
-	  if (isascii (*s) && isprint (*s))
+	  if ((isascii (*s) && isprint (*s)) || (*s >= 0x80))
 	    putc_unlocked (*s, fp);
 	  else
 	    {
-- 
cgit v1.2.3