From 5c5d24f088506226f90552ceab51e994bf50fddf Mon Sep 17 00:00:00 2001
From: jilles <devnull@localhost>
Date: Fri, 30 Mar 2007 16:32:43 -0700
Subject: [PATCH] [svn] Hack to allow some more warnings, already present in
 configure (?).

---
 ChangeLog       | 18 ++++++++++++++++++
 aclocal.m4      |  4 ++--
 include/serno.h |  2 +-
 3 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 0eb6344..0f1e94a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+jilles      2007/03/29 20:03:06 UTC	(20070329-3319)
+  Log:
+  Merge old trunk r2077,r2079:
+  - Move closing of servlink control fd to close_connection()
+    instead of doing it in exit_local_server(), and make sure
+    we first close the data fd and then the control fd.
+  - Have servlink process ready fds in order net, data, ctrl
+    instead of ctrl, data, net.  This seems to fix the problem
+    that squit reasons do not show up on the other side of a
+    ziplink (by making it send any final SQUIT and/or ERROR
+    before noticing the closed control fd).
+  
+
+  Changes:	Modified:
+  +1 -1		trunk/servlink/io.c (File Modified) 
+  +3 -12	trunk/src/client.c (File Modified) 
+
+
 jilles      2007/03/28 23:17:06 UTC	(20070328-3317)
   Log:
   Don't show the UID if a TS6 server sends a kick with
diff --git a/aclocal.m4 b/aclocal.m4
index cc5d05d..83a647d 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,4 +1,4 @@
-# $Id: aclocal.m4 918 2006-02-23 18:17:21Z nenolod $ - aclocal.m4 - Autoconf fun...
+# $Id: aclocal.m4 3321 2007-03-30 23:32:43Z jilles $ - aclocal.m4 - Autoconf fun...
 AC_DEFUN([AC_DEFINE_DIR], [
   test "x$prefix" = xNONE && prefix="$ac_default_prefix"
   test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
@@ -34,7 +34,7 @@ AC_DEFUN([CHARYBDIS_C_GCC_TRY_FLAGS],[
 #include <stdio.h>
 int main(void);
 ],[
-    strcmp("a","b"); fprintf(stdout,"test ok\n");
+    (void)strcmp("a","b"); fprintf(stdout,"test ok\n");
 ], [$2=yes], [$2=no])
    CFLAGS="${oldcflags}"])
   if test "x$$2" = xyes; then
diff --git a/include/serno.h b/include/serno.h
index b24b94f..043b4be 100644
--- a/include/serno.h
+++ b/include/serno.h
@@ -1 +1 @@
-#define SERNO "20070328-3317"
+#define SERNO "20070329-3319"