X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=conn.c;h=814adc8b646cf6b00ee0b970f416bb461f0fdf16;hb=refs%2Fheads%2Fmaster;hp=36f554f1a6e422ca34e3de52540bea7157750dc4;hpb=f9110be3f2ae8ffbdb09df454275afef091e2ac7;p=innduct.git

diff --git a/conn.c b/conn.c
index 36f554f..814adc8 100644
--- a/conn.c
+++ b/conn.c
@@ -3,25 +3,9 @@
  *  tailing reliable realtime streaming feeder for inn
  *  conn.c - connection establishment and teardown
  *
- *  Copyright (C) 2010 Ian Jackson <ijackson@chiark.greenend.org.uk>
- * 
- *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- * 
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- * 
- *  You should have received a copy of the GNU General Public License
- *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- *  (I believe that when you compile and link this as part of the inn2
- *  build, with the Makefile runes I have provided, all the libraries
- *  and files which end up included in innduct are licence-compatible
- *  with GPLv3.  If not then please let me know.  -Ian Jackson.)
+ *  Copyright Ian Jackson <ijackson@chiark.greenend.org.uk>
+ *  and contributors; see LICENCE.txt.
+ *  SPDX-License-Identifier: GPL-3.0-or-later
  */
 
 #include "innduct.h"
@@ -293,8 +277,8 @@ static void *connchild_event(oop_source *lp, int fd, oop_event e, void *u) {
 
 #define CHK(field, val)							   \
   if (h->cmsg_##field != val) {						   \
-    crash("connect: child sent cmsg with cmsg_" #field "=%d, expected %d", \
-	  h->cmsg_##field, val);					   \
+    crash("connect: child sent cmsg with cmsg_" #field "=%ld, expected %ld", \
+	  (long)h->cmsg_##field, (long)val);				   \
     goto x;								   \
   }
   CHK(level, SOL_SOCKET);