Update copyright notices, remove Ivo's email address.

AUTHORS

@@ -1,6 +1,6 @@
 Main tinc authors:
 Guus Sliepen <guus@tinc-vpn.org>
-Ivo Timmermans <ivo@tinc-vpn.org>
+Ivo Timmermans (inactive)
 
 These files are from other sources:
  * lib/pidfile.h and lib/pidfile.c are by Martin Schulze, taken from

README

@@ -1,9 +1,9 @@
 This is the README file for tinc version 1.0.4. Installation
 instructions may be found in the INSTALL file.
 
-tinc is Copyright (C) 1998-2005 by:
+tinc is Copyright (C) 1998-2006 by:
 
-Ivo Timmermans <ivo@tinc-vpn.org>,
+Ivo Timmermans,
 Guus Sliepen <guus@tinc-vpn.org>,
 and others.
 

doc/CONNECTIVITY

@@ -1,7 +1,7 @@
 This document describes how nodes in a VPN find and connect to eachother and
 maintain a stable network.
 
-   Copyright 2001-2005 Guus Sliepen <guus@tinc-vpn.org>
+   Copyright 2001-2006 Guus Sliepen <guus@tinc-vpn.org>
 
    Permission is granted to make and distribute verbatim copies of
    this documentation provided the copyright notice and this

doc/NETWORKING

@@ -1,7 +1,7 @@
 This is the network infrastructure documentation for tinc, a Virtual Private
 Network daemon.
 
-   Copyright 2001-2005 Guus Sliepen <guus@tinc-vpn.org>
+   Copyright 2001-2006 Guus Sliepen <guus@tinc-vpn.org>
 
    Permission is granted to make and distribute verbatim copies of
    this documentation provided the copyright notice and this

doc/PROTOCOL

@@ -1,7 +1,7 @@
 This is the protocol documentation for tinc, a Virtual Private Network daemon.
 
-   Copyright 2000-2005 Guus Sliepen <guus@tinc-vpn.org>,
+   Copyright 2000-2006 Guus Sliepen <guus@tinc-vpn.org>,
-             2000-2005 Ivo Timmmermans <ivo@tinc-vpn.org>
+             2000-2005 Ivo Timmmermans
 
    Permission is granted to make and distribute verbatim copies of
    this documentation provided the copyright notice and this

doc/SECURITY2

@@ -1,7 +1,7 @@
 This is the security documentation for tinc, a Virtual Private Network daemon.
 
-   Copyright 2001-2005 Guus Sliepen <guus@tinc-vpn.org>,
+   Copyright 2001-2006 Guus Sliepen <guus@tinc-vpn.org>,
-             2001-2005 Wessel Dankers <wsl@tinc-vpn.org>
+             2001-2006 Wessel Dankers <wsl@tinc-vpn.org>
 
    Permission is granted to make and distribute verbatim copies of
    this documentation provided the copyright notice and this

doc/tinc.conf.5.in

@@ -1,7 +1,7 @@
 .Dd 2002-04-09
 .Dt TINC.CONF 5
 .\" Manual page created by:
-.\" Ivo Timmermans <ivo@tinc-vpn.org>
+.\" Ivo Timmermans
 .\" Guus Sliepen <guus@tinc-vpn.org>
 .Sh NAME
 .Nm tinc.conf

doc/tinc.texi

@@ -16,8 +16,8 @@
 
 This is the info manual for @value{PACKAGE} version @value{VERSION}, a Virtual Private Network daemon.
 
-Copyright @copyright{} 1998-2005 Ivo Timmermans
+Copyright @copyright{} 1998-2006 Ivo Timmermans,
-<ivo@@tinc-vpn.org>, Guus Sliepen <guus@@tinc-vpn.org> and
+Guus Sliepen <guus@@tinc-vpn.org> and
 Wessel Dankers <wsl@@tinc-vpn.org>.
 
 $Id$
@@ -43,8 +43,8 @@ permission notice identical to this one.
 @cindex copyright
 This is the info manual for @value{PACKAGE} version @value{VERSION}, a Virtual Private Network daemon.
 
-Copyright @copyright{} 1998-2005 Ivo Timmermans
+Copyright @copyright{} 1998-2006 Ivo Timmermans,
-<ivo@@tinc-vpn.org>, Guus Sliepen <guus@@tinc-vpn.org> and
+Guus Sliepen <guus@@tinc-vpn.org> and
 Wessel Dankers <wsl@@tinc-vpn.org>.
 
 $Id$

doc/tincd.8.in

@@ -1,7 +1,7 @@
 .Dd 2002-03-25
 .Dt TINCD 8
 .\" Manual page created by:
-.\" Ivo Timmermans <ivo@tinc-vpn.org>
+.\" Ivo Timmermans
 .\" Guus Sliepen <guus@tinc-vpn.org>
 .Sh NAME
 .Nm tincd
@@ -181,7 +181,7 @@ tinc comes with ABSOLUTELY NO WARRANTY.
 This is free software, and you are welcome to redistribute it under certain conditions;
 see the file COPYING for details.
 .Sh AUTHORS
-.An "Ivo Timmermans" Aq ivo@tinc-vpn.org
+.An "Ivo Timmermans"
 .An "Guus Sliepen" Aq guus@tinc-vpn.org
 .Pp
 And thanks to many others for their contributions to tinc!

have.h

@@ -1,7 +1,7 @@
 /*
     have.h -- include headers which are known to exist
-    Copyright (C) 1998-2005 Ivo Timmermans <ivo@tinc-vpn.org>
+    Copyright (C) 1998-2005 Ivo Timmermans
-                  2003-2005 Guus Sliepen <guus@tinc-vpn.org>
+                  2003-2006 Guus Sliepen <guus@tinc-vpn.org>
 
     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

lib/avl_tree.c

@@ -1,8 +1,8 @@
 /*
     avl_tree.c -- avl_ tree and linked list convenience
     Copyright (C) 1998 Michael H. Buselli
-                  2000-2005 Ivo Timmermans <ivo@tinc-vpn.org>,
+                  2000-2005 Ivo Timmermans,
-                  2000-2005 Guus Sliepen <guus@tinc-vpn.org>
+                  2000-2006 Guus Sliepen <guus@tinc-vpn.org>
                   2000-2005 Wessel Dankers <wsl@tinc-vpn.org>
 
     This program is free software; you can redistribute it and/or modify

lib/avl_tree.h

@@ -1,8 +1,8 @@
 /*
     avl_tree.h -- header file for avl_tree.c
     Copyright (C) 1998 Michael H. Buselli
-                  2000-2005 Ivo Timmermans <ivo@tinc-vpn.org>,
+                  2000-2005 Ivo Timmermans,
-                  2000-2005 Guus Sliepen <guus@tinc-vpn.org>
+                  2000-2006 Guus Sliepen <guus@tinc-vpn.org>
                   2000-2005 Wessel Dankers <wsl@tinc-vpn.org>
 
     This program is free software; you can redistribute it and/or modify

lib/dropin.c

@@ -1,7 +1,7 @@
 /*
     dropin.c -- a set of drop-in replacements for libc functions
-    Copyright (C) 2000-2005 Ivo Timmermans <ivo@tinc-vpn.org>,
+    Copyright (C) 2000-2005 Ivo Timmermans,
-                  2000-2005 Guus Sliepen <guus@tinc-vpn.org>
+                  2000-2006 Guus Sliepen <guus@tinc-vpn.org>
 
     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

lib/dropin.h

@@ -1,7 +1,7 @@
 /*
     dropin.h -- header file for dropin.c
-    Copyright (C) 2000-2005 Ivo Timmermans <ivo@tinc-vpn.org>,
+    Copyright (C) 2000-2005 Ivo Timmermans,
-                  2000-2005 Guus Sliepen <guus@tinc-vpn.org>
+                  2000-2006 Guus Sliepen <guus@tinc-vpn.org>
 
     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

lib/ethernet.h

@@ -1,7 +1,7 @@
 /*
     ethernet.h -- missing Ethernet related definitions
-    Copyright (C) 2005 Ivo Timmermans <ivo@tinc-vpn.org>
+    Copyright (C) 2005 Ivo Timmermans
-                  2005 Guus Sliepen <guus@tinc-vpn.org>
+                  2006 Guus Sliepen <guus@tinc-vpn.org>
 
     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

lib/ipv4.h

@@ -1,7 +1,7 @@
 /*
     ipv4.h -- missing IPv4 related definitions
-    Copyright (C) 2005 Ivo Timmermans <ivo@tinc-vpn.org>
+    Copyright (C) 2005 Ivo Timmermans
-                  2005 Guus Sliepen <guus@tinc-vpn.org>
+                  2006 Guus Sliepen <guus@tinc-vpn.org>
 
     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

lib/ipv6.h

@@ -1,7 +1,7 @@
 /*
     ipv6.h -- missing IPv6 related definitions
-    Copyright (C) 2005 Ivo Timmermans <ivo@tinc-vpn.org>
+    Copyright (C) 2005 Ivo Timmermans
-                  2005 Guus Sliepen <guus@tinc-vpn.org>
+                  2006 Guus Sliepen <guus@tinc-vpn.org>
 
     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

lib/list.c

@@ -1,7 +1,7 @@
 /*
     list.c -- functions to deal with double linked lists
-    Copyright (C) 2000-2005 Ivo Timmermans <ivo@tinc-vpn.org>
+    Copyright (C) 2000-2005 Ivo Timmermans
-                  2000-2005 Guus Sliepen <guus@tinc-vpn.org>
+                  2000-2006 Guus Sliepen <guus@tinc-vpn.org>
 
     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

lib/list.h

@@ -1,7 +1,7 @@
 /*
     list.h -- header file for list.c
-    Copyright (C) 2000-2005 Ivo Timmermans <ivo@tinc-vpn.org>
+    Copyright (C) 2000-2005 Ivo Timmermans
-                  2000-2005 Guus Sliepen <guus@tinc-vpn.org>
+                  2000-2006 Guus Sliepen <guus@tinc-vpn.org>
 
     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

lib/splay_tree.c

@@ -1,6 +1,6 @@
 /*
     splay_tree.c -- splay tree and linked list convenience
-    Copyright (C) 2004-2005 Guus Sliepen <guus@tinc-vpn.org>
+    Copyright (C) 2004-2006 Guus Sliepen <guus@tinc-vpn.org>
 
     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

lib/splay_tree.h

@@ -1,6 +1,6 @@
 /*
     splay_tree.h -- header file for splay_tree.c
-    Copyright (C) 2004-2005 Guus Sliepen <guus@tinc-vpn.org>
+    Copyright (C) 2004-2006 Guus Sliepen <guus@tinc-vpn.org>
 
     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

lib/utils.c

@@ -1,7 +1,7 @@
 /*
     utils.c -- gathering of some stupid small functions
     Copyright (C) 1999-2005 Ivo Timmermans <zarq@iname.com>
-                  2000-2005 Guus Sliepen <guus@tinc-vpn.org>
+                  2000-2006 Guus Sliepen <guus@tinc-vpn.org>
 
     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

lib/utils.h

@@ -1,7 +1,7 @@
 /*
     utils.h -- header file for utils.c
     Copyright (C) 1999-2005 Ivo Timmermans <zarq@iname.com>
-                  2000-2005 Guus Sliepen <guus@tinc-vpn.org>
+                  2000-2006 Guus Sliepen <guus@tinc-vpn.org>
 
     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

po/nl.po

@@ -1,13 +1,13 @@
 # Dutch messages for tinc
-# Copyright (C) 1999-2004 Ivo Timmermans, Guus Sliepen.
+# Copyright (C) 1999-2006 Ivo Timmermans, Guus Sliepen.
-# Ivo Timmermans <ivo@tinc-vpn.org>, 1999-2004.
+# Ivo Timmermans <ivo@tinc-vpn.org>, 1999-2006.
-# Guus Sliepen <guus@tinc-vpn.org>, 2000-2004.
+# Guus Sliepen <guus@tinc-vpn.org>, 2000-2006.
 msgid ""
 msgstr ""
 "Project-Id-Version: tinc 1.0-svn\n"
 "Report-Msgid-Bugs-To: tinc-devel@tinc-vpn.org\n"
-"POT-Creation-Date: 2005-05-04 20:25+0200\n"
+"POT-Creation-Date: 2006-04-26 15:46+0200\n"
-"PO-Revision-Date: 2004-03-15 19:28+0100\n"
+"PO-Revision-Date: 2006-04-26 15:25+0200\n"
 "Last-Translator: Guus Sliepen <guus@tinc-vpn.org>\n"
 "Language-Team: Dutch <vertaling@tinc-vpn.org>\n"
 "MIME-Version: 1.0\n"
@@ -18,30 +18,30 @@ msgstr ""
 msgid "(unable to format errormessage)"
 msgstr "(kon foutmelding niet samenstellen)"
 
-#: src/conf.c:159
+#: src/conf.c:160
 #, c-format
 msgid "\"yes\" or \"no\" expected for configuration variable %s in %s line %d"
 msgstr ""
 "\"ja\" of \"nee\" verwacht voor configuratievariabele %s in %s regel %d"
 
-#: src/conf.c:175
+#: src/conf.c:176
 #, c-format
 msgid "Integer expected for configuration variable %s in %s line %d"
 msgstr "Geheel getal verwacht voor configuratievariabele %s in %s regel %d"
 
-#: src/conf.c:209
+#: src/conf.c:210
 #, c-format
 msgid ""
 "Hostname or IP address expected for configuration variable %s in %s line %d"
 msgstr ""
 "Hostnaam of IP adres verwacht voor configuratievariabele %s in %s regel %d"
 
-#: src/conf.c:225
+#: src/conf.c:226
 #, c-format
 msgid "Subnet expected for configuration variable %s in %s line %d"
 msgstr "Subnet verwacht voor configuratievariabele %s in %s regel %d"
 
-#: src/conf.c:236
+#: src/conf.c:237
 #, c-format
 msgid ""
 "Network address and prefix length do not match for configuration variable %s "
@@ -50,34 +50,34 @@ msgstr ""
 "Netwerk adres en prefix lengte komen niet overeen bij configuratievariabele %"
 "s in %s regel %d"
 
-#: src/conf.c:336
+#: src/conf.c:337
 #, c-format
 msgid "Cannot open config file %s: %s"
 msgstr "Kan configuratie bestand %s niet openen: %s"
 
-#: src/conf.c:390
+#: src/conf.c:391
 #, c-format
 msgid "No value for variable `%s' on line %d while reading config file %s"
 msgstr ""
 "Geen waarde voor variabele `%s' op regel %d tijdens het lezen van "
 "configuratie bestand %s"
 
-#: src/conf.c:421
+#: src/conf.c:422
 #, c-format
 msgid "Failed to read `%s': %s"
 msgstr "Lezen van `%s' mislukte: %s"
 
-#: src/conf.c:443
+#: src/conf.c:444
 #, c-format
 msgid "Please enter a file to save %s to [%s]: "
 msgstr "Geef een bestand om de %s naar de schrijven [%s]: "
 
-#: src/conf.c:450
+#: src/conf.c:451
 #, c-format
 msgid "Error while reading stdin: %s\n"
 msgstr "Fout tijdens lezen van standaardinvoer: %s\n"
 
-#: src/conf.c:482
+#: src/conf.c:483
 #, c-format
 msgid "Error opening file `%s': %s\n"
 msgstr "Fout bij het openen van het bestand `%s': %s\n"
@@ -96,44 +96,58 @@ msgstr "Verbindingen:"
 
 #: src/connection.c:124
 #, c-format
-msgid " %s at %s options %lx socket %d status %04x"
+msgid " %s at %s options %lx socket %d status %04x outbuf %d/%d/%d"
-msgstr " %s op %s opties %lx socket %d status %04x"
+msgstr " %s op %s opties %lx socket %d status %04x outbuf %d/%d/%d"
 
-#: src/connection.c:128
+#: src/connection.c:129
 msgid "End of connections."
 msgstr "Einde van verbindingen."
 
-#: src/meta.c:45
+#: src/meta.c:44
 #, c-format
 msgid "Sending %d bytes of metadata to %s (%s)"
 msgstr "Verzenden van %d bytes metadata naar %s (%s)"
 
-#: src/meta.c:51
+#: src/meta.c:66
 #, c-format
 msgid "Error while encrypting metadata to %s (%s): %s"
 msgstr "Fout tijdens versleutelen van metadata naar %s (%s): %s"
 
-#: src/meta.c:64 src/meta.c:117
+#: src/meta.c:70
+msgid "Encrypted data too long! Heap corrupted!"
+msgstr "Versleutelde data te lang! Heap gecorrumpeerd!"
+
+#: src/meta.c:86
+#, c-format
+msgid "Flushing %d bytes to %s (%s)"
+msgstr "Wegschrijven %d bytes naar %s (%s)"
+
+#: src/meta.c:93 src/meta.c:154
 #, c-format
 msgid "Connection closed by %s (%s)"
 msgstr "Verbinding beëindigd door %s (%s)"
 
-#: src/meta.c:69
+#: src/meta.c:98
 #, c-format
-msgid "Sending meta data to %s (%s) failed: %s"
+msgid "Flushing %d bytes to %s (%s) would block"
-msgstr "Fout tijdens verzenden metadata naar %s (%s): %s"
+msgstr "Wegschrijven %d bytes naar %s (%s) zou blokkeren"
 
-#: src/meta.c:122
+#: src/meta.c:102
+#, c-format
+msgid "Flushing meta data to %s (%s) failed: %s"
+msgstr "Wegschrijven metadata naar %s (%s) faalde: %s"
+
+#: src/meta.c:159
 #, c-format
 msgid "Metadata socket read error for %s (%s): %s"
 msgstr "Fout op metadata socket voor %s (%s) tijdens lezen: %s"
 
-#: src/meta.c:137
+#: src/meta.c:174
 #, c-format
 msgid "Error while decrypting metadata from %s (%s): %s"
 msgstr "Fout tijdens ontsleutelen van metadata van %s (%s): %s"
 
-#: src/meta.c:190
+#: src/meta.c:227
 #, c-format
 msgid "Metadata read buffer overflow for %s (%s)"
 msgstr "Metadata leesbuffer overloop voor %s (%s)"
@@ -147,47 +161,52 @@ msgstr "Verwijderen onbereikbare nodes"
 msgid "Purging node %s (%s)"
 msgstr "Verwijdering node %s (%s)"
 
-#: src/net.c:170
+#: src/net.c:173
 #, c-format
 msgid "Closing connection with %s (%s)"
 msgstr "Beëindigen verbinding met %s (%s)"
 
-#: src/net.c:235
-#, c-format
-msgid "%s (%s) didn't respond to PING"
-msgstr "%s (%s) antwoordde niet op ping"
-
 #: src/net.c:244
 #, c-format
+msgid "%s (%s) didn't respond to PING in %d seconds"
+msgstr "%s (%s) antwoordde niet binnen %d seconden op PING"
+
+#: src/net.c:253
+#, c-format
 msgid "Old connection_t for %s (%s) status %04x still lingering, deleting..."
 msgstr ""
 "Oude connection_t voor %s (%s) status %04x nog steeds aanwezig, wordt "
 "verwijderd..."
 
-#: src/net.c:249
+#: src/net.c:258
 #, c-format
 msgid "Timeout from %s (%s) during authentication"
 msgstr "Timeout van %s (%s) tijdens authenticatie"
 
-#: src/net.c:297
+#: src/net.c:273
+#, c-format
+msgid "%s (%s) could not flush for %d seconds (%d bytes remaining)"
+msgstr "%s (%s) kon niet binnen %d seconden wegschrijven (%d bytes over)"
+
+#: src/net.c:318
 #, c-format
 msgid "Error while connecting to %s (%s): %s"
 msgstr "Fout tijdens schrijven naar %s (%s): %s"
 
-#: src/net.c:353
+#: src/net.c:381
 #, c-format
 msgid "Error while waiting for input: %s"
 msgstr "Fout tijdens wachten op invoer: %s"
 
-#: src/net.c:384
+#: src/net.c:412
 msgid "Regenerating symmetric key"
 msgstr "Hergenereren symmetrische sleutel"
 
-#: src/net.c:401
+#: src/net.c:429
 msgid "Flushing event queue"
 msgstr "Legen taakrij"
 
-#: src/net.c:425
+#: src/net.c:453
 msgid "Unable to reread configuration file, exitting."
 msgstr "Kan configuratiebestand niet herlezen, beëindigen."
 
@@ -268,9 +287,9 @@ msgstr "Fout tijdens versleutelen pakket naar %s (%s): %s"
 msgid "Setting outgoing packet priority to %d"
 msgstr "Instellen prioriteit uitgaand pakket op %d"
 
-#: src/net_packet.c:392 src/net_setup.c:481 src/net_socket.c:73
+#: src/net_packet.c:392 src/net_setup.c:479 src/net_socket.c:129
-#: src/net_socket.c:124 src/net_socket.c:153 src/tincd.c:434 src/tincd.c:468
+#: src/net_socket.c:158 src/tincd.c:435 src/tincd.c:472 src/process.c:198
-#: src/process.c:198 src/process.c:231 src/process.c:428 src/bsd/device.c:93
+#: src/process.c:231 src/process.c:428 src/bsd/device.c:93
 #: src/bsd/device.c:112 src/cygwin/device.c:140 src/cygwin/device.c:171
 #: src/mingw/device.c:66 src/mingw/device.c:75 src/mingw/device.c:80
 #: src/mingw/device.c:236 src/mingw/device.c:243 src/mingw/device.c:248
@@ -377,145 +396,145 @@ msgstr "Ongeldige naam voor mijzelf!"
 msgid "Cannot open host configuration file for myself!"
 msgstr "Kan host configuratie bestand voor mijzelf niet openen!"
 
-#: src/net_setup.c:307
+#: src/net_setup.c:305
 msgid "Invalid routing mode!"
 msgstr "Ongeldige routing modus!"
 
-#: src/net_setup.c:318
+#: src/net_setup.c:316
 msgid "PriorityInheritance not supported on this platform"
 msgstr "PriorityInheritance wordt niet ondersteund op dit platform"
 
-#: src/net_setup.c:326
+#: src/net_setup.c:324
 msgid "Bogus maximum timeout!"
 msgstr "Onzinnige maximum timeout!"
 
-#: src/net_setup.c:340
+#: src/net_setup.c:338
 msgid "Invalid address family!"
 msgstr "Ongeldige adresfamilie!"
 
-#: src/net_setup.c:358
+#: src/net_setup.c:356
 msgid "Unrecognized cipher type!"
 msgstr "Onbekend cipher type!"
 
-#: src/net_setup.c:383 src/protocol_auth.c:192
+#: src/net_setup.c:381 src/protocol_auth.c:194
 #, c-format
 msgid "Error during initialisation of cipher for %s (%s): %s"
 msgstr "Fout tijdens initialisatie van cipher voor %s (%s): %s"
 
-#: src/net_setup.c:400
+#: src/net_setup.c:398
 msgid "Unrecognized digest type!"
 msgstr "Onbekend digest type!"
 
-#: src/net_setup.c:413
+#: src/net_setup.c:411
 msgid "MAC length exceeds size of digest!"
 msgstr "MAC lengte is groter dan dat van digest!"
 
-#: src/net_setup.c:416
+#: src/net_setup.c:414
 msgid "Bogus MAC length!"
 msgstr "Onzinnige MAC lengte!"
 
-#: src/net_setup.c:430
+#: src/net_setup.c:428
 msgid "Bogus compression level!"
 msgstr "Onzinnig compressieniveau!"
 
-#: src/net_setup.c:503
+#: src/net_setup.c:501
 #, c-format
 msgid "Listening on %s"
 msgstr "Luisterend op %s"
 
-#: src/net_setup.c:514
+#: src/net_setup.c:512
 msgid "Ready"
 msgstr "Gereed"
 
-#: src/net_setup.c:516
+#: src/net_setup.c:514
 msgid "Unable to create any listening socket!"
 msgstr "Kon geen enkele luistersocket aanmaken!"
 
 #: src/net_socket.c:63
 #, c-format
+msgid "fcntl for %s: %s"
+msgstr "fcntl voor %s: %s"
+
+#: src/net_socket.c:90
+#, c-format
 msgid "Creating metasocket failed: %s"
 msgstr "Aanmaak van metasocket mislukt: %s"
 
-#: src/net_socket.c:104 src/net_socket.c:196
+#: src/net_socket.c:109 src/net_socket.c:201
 #, c-format
 msgid "Can't bind to interface %s: %s"
 msgstr "Kan niet aan interface %s binden: %s"
 
-#: src/net_socket.c:109
+#: src/net_socket.c:114
 msgid "BindToInterface not supported on this platform"
 msgstr "BindToInterface wordt niet ondersteund op dit platform"
 
-#: src/net_socket.c:116
+#: src/net_socket.c:121
 #, c-format
 msgid "Can't bind to %s/tcp: %s"
 msgstr "Kan niet aan %s/tcp binden: %s"
 
-#: src/net_socket.c:143
+#: src/net_socket.c:148
 #, c-format
 msgid "Creating UDP socket failed: %s"
 msgstr "Aanmaak UDP socket mislukte: %s"
 
-#: src/net_socket.c:207
+#: src/net_socket.c:212
 #, c-format
 msgid "Can't bind to %s/udp: %s"
 msgstr "Kan niet aan %s/udp binden: %s"
 
-#: src/net_socket.c:234
+#: src/net_socket.c:239
 #, c-format
 msgid "Trying to re-establish outgoing connection in %d seconds"
 msgstr "Poging tot herstellen van uitgaande verbinding over %d seconden"
 
-#: src/net_socket.c:242
+#: src/net_socket.c:249
 #, c-format
 msgid "Connected to %s (%s)"
 msgstr "Verbonden met %s (%s)"
 
-#: src/net_socket.c:249 src/net_socket.c:333 src/net_socket.c:445
+#: src/net_socket.c:268
-#, c-format
-msgid "fcntl for %s: %s"
-msgstr "fcntl voor %s: %s"
-
-#: src/net_socket.c:269
 #, c-format
 msgid "Could not set up a meta connection to %s"
 msgstr "Kon geen metaverbinding aangaan met %s"
 
-#: src/net_socket.c:303
+#: src/net_socket.c:302
 #, c-format
 msgid "Trying to connect to %s (%s)"
 msgstr "Poging tot verbinden met %s (%s)"
 
-#: src/net_socket.c:309
+#: src/net_socket.c:308
 #, c-format
 msgid "Creating socket for %s failed: %s"
 msgstr "Aanmaken socket voor %s mislukt: %s"
 
-#: src/net_socket.c:349
+#: src/net_socket.c:330
 #, c-format
 msgid "%s: %s"
 msgstr "%s: %s"
 
-#: src/net_socket.c:370
+#: src/net_socket.c:351
 #, c-format
 msgid "Already connected to %s"
 msgstr "Reeds verbonden met %s"
 
-#: src/net_socket.c:389
+#: src/net_socket.c:370
 #, c-format
 msgid "No address specified for %s"
 msgstr "Geen adres gespecificeerd voor %s"
 
-#: src/net_socket.c:419
+#: src/net_socket.c:402
 #, c-format
 msgid "Accepting a new connection failed: %s"
 msgstr "Aanname van nieuwe verbinding is mislukt: %s"
 
-#: src/net_socket.c:438
+#: src/net_socket.c:421
 #, c-format
 msgid "Connection from %s"
 msgstr "Verbinding van %s"
 
-#: src/net_socket.c:471
+#: src/net_socket.c:446
 #, c-format
 msgid "Invalid name for outgoing connection in %s line %d"
 msgstr "Ongeldige naam voor uitgaande verbinding in %s regel %d"
@@ -615,11 +634,11 @@ msgstr "Verzoek reeds gezien"
 msgid "Aging past requests: deleted %d, left %d"
 msgstr "Veroudering vorige verzoeken: %d gewist, %d overgebleven"
 
-#: src/protocol_auth.c:58 src/protocol_auth.c:212 src/protocol_auth.c:341
+#: src/protocol_auth.c:58 src/protocol_auth.c:214 src/protocol_auth.c:345
-#: src/protocol_auth.c:408 src/protocol_auth.c:534 src/protocol_edge.c:73
+#: src/protocol_auth.c:412 src/protocol_auth.c:538 src/protocol_edge.c:73
 #: src/protocol_edge.c:188 src/protocol_key.c:62 src/protocol_key.c:105
-#: src/protocol_key.c:172 src/protocol_misc.c:54 src/protocol_misc.c:83
+#: src/protocol_key.c:173 src/protocol_misc.c:56 src/protocol_misc.c:85
-#: src/protocol_misc.c:171 src/protocol_subnet.c:58 src/protocol_subnet.c:170
+#: src/protocol_misc.c:176 src/protocol_subnet.c:58 src/protocol_subnet.c:170
 #, c-format
 msgid "Got bad %s from %s (%s)"
 msgstr "Kreeg verkeerde %s van %s (%s)"
@@ -647,76 +666,76 @@ msgstr "Ander %s (%s) gebruikt incompatibele versie %d"
 msgid "Peer %s had unknown identity (%s)"
 msgstr "Ander %s heeft onbekende identiteit (%s)"
 
-#: src/protocol_auth.c:156
+#: src/protocol_auth.c:158
 #, c-format
 msgid "Generated random meta key (unencrypted): %s"
 msgstr "Willekeurige meta sleutel aangemaakt (niet versleuteld): %s"
 
-#: src/protocol_auth.c:168 src/protocol_auth.c:241
+#: src/protocol_auth.c:170 src/protocol_auth.c:243
 #, c-format
 msgid "Error during encryption of meta key for %s (%s)"
 msgstr "Fout tijdens versleutelen van meta key voor %s (%s)"
 
-#: src/protocol_auth.c:222 src/protocol_auth.c:351 src/protocol_auth.c:416
+#: src/protocol_auth.c:224 src/protocol_auth.c:355 src/protocol_auth.c:420
-#: src/protocol_auth.c:438
+#: src/protocol_auth.c:442
 #, c-format
 msgid "Possible intruder %s (%s): %s"
 msgstr "Mogelijke indringer %s (%s): %s"
 
-#: src/protocol_auth.c:249
+#: src/protocol_auth.c:251
 #, c-format
 msgid "Received random meta key (unencrypted): %s"
 msgstr "Ontving willekeurige meta key (niet versleuteld): %s"
 
-#: src/protocol_auth.c:260
+#: src/protocol_auth.c:262
 #, c-format
 msgid "%s (%s) uses unknown cipher!"
 msgstr "%s (%s) gebruikt onbekende cipher!"
 
-#: src/protocol_auth.c:268
+#: src/protocol_auth.c:270
 #, c-format
 msgid "Error during initialisation of cipher from %s (%s): %s"
 msgstr "Fout tijdens initalisatie van cipher van %s (%s): %s"
 
-#: src/protocol_auth.c:284 src/protocol_key.c:242
+#: src/protocol_auth.c:286 src/protocol_key.c:243
 #, c-format
 msgid "Node %s (%s) uses unknown digest!"
 msgstr "Node %s (%s) gebruikt onbekende digest!"
 
-#: src/protocol_auth.c:289
+#: src/protocol_auth.c:291
 #, c-format
 msgid "%s (%s) uses bogus MAC length!"
 msgstr "%s (%s) gebruikt onzinnige MAC lengte!"
 
-#: src/protocol_auth.c:384
+#: src/protocol_auth.c:388
 #, c-format
 msgid "Error during calculation of response for %s (%s): %s"
 msgstr "Fout tijdens berekenen van antwoord voor %s (%s): %s"
 
-#: src/protocol_auth.c:417
+#: src/protocol_auth.c:421
 msgid "wrong challenge reply length"
 msgstr "verkeerde lengte antwoord op uitdaging"
 
-#: src/protocol_auth.c:430
+#: src/protocol_auth.c:434
 #, c-format
 msgid "Error during calculation of response from %s (%s): %s"
 msgstr "Fout tijdens narekenen van antwoord van %s (%s): %s"
 
-#: src/protocol_auth.c:439
+#: src/protocol_auth.c:443
 msgid "wrong challenge reply"
 msgstr "verkeerd antwoord op uitdaging"
 
-#: src/protocol_auth.c:444
+#: src/protocol_auth.c:448
 #, c-format
 msgid "Expected challenge reply: %s"
 msgstr "Verwachtte antwoord op uitdaging: %s"
 
-#: src/protocol_auth.c:550
+#: src/protocol_auth.c:554
 #, c-format
 msgid "Established a second connection with %s (%s), closing old connection"
 msgstr "Tweede verbinding met %s (%s) gemaakt, oude verbinding wordt gesloten"
 
-#: src/protocol_auth.c:573
+#: src/protocol_auth.c:577
 #, c-format
 msgid "Connection with %s (%s) activated"
 msgstr "Verbinding met %s (%s) geactiveerd"
@@ -757,14 +776,14 @@ msgstr "Kreeg %s van %s (%s) voor onszelf"
 msgid "Got %s from %s (%s) origin %s which does not exist"
 msgstr "Kreeg %s van %s (%s) herkomst %s welke niet bestaat"
 
-#: src/protocol_key.c:113 src/protocol_key.c:180
+#: src/protocol_key.c:113 src/protocol_key.c:181
 #, c-format
 msgid ""
 "Got %s from %s (%s) origin %s which does not exist in our connection list"
 msgstr ""
 "Kreeg %s van %s (%s) herkomst %s welke niet voorkomt in de verbindingslijst"
 
-#: src/protocol_key.c:121 src/protocol_key.c:188
+#: src/protocol_key.c:121 src/protocol_key.c:189
 #, c-format
 msgid ""
 "Got %s from %s (%s) destination %s which does not exist in our connection "
@@ -772,37 +791,37 @@ msgid ""
 msgstr ""
 "Kreeg %s van %s (%s) doel %s welke niet voorkomt in de verbindingslijst"
 
-#: src/protocol_key.c:222
+#: src/protocol_key.c:223
 #, c-format
 msgid "Node %s (%s) uses unknown cipher!"
 msgstr "Node %s (%s) gebruikt onbekende cipher!"
 
-#: src/protocol_key.c:228
+#: src/protocol_key.c:229
 #, c-format
 msgid "Node %s (%s) uses wrong keylength!"
 msgstr "Node %s (%s) gebruikt verkeerde lengte sleutel!"
 
-#: src/protocol_key.c:248
+#: src/protocol_key.c:249
 #, c-format
 msgid "Node %s (%s) uses bogus MAC length!"
 msgstr "Node %s (%s) gebruikt onzinnige MAC lengte!"
 
-#: src/protocol_key.c:257
+#: src/protocol_key.c:258
 #, c-format
 msgid "Node %s (%s) uses bogus compression level!"
 msgstr "Node %s (%s) gebruikt onzinnig compressieniveau!"
 
-#: src/protocol_key.c:265
+#: src/protocol_key.c:266
 #, c-format
 msgid "Error during initialisation of key from %s (%s): %s"
 msgstr "Fout tijdens initialisatie van sleutel van %s (%s): %s"
 
-#: src/protocol_misc.c:59
+#: src/protocol_misc.c:61
 #, c-format
 msgid "Status message from %s (%s): %d: %s"
 msgstr "Statusmelding van %s (%s): %d: %s"
 
-#: src/protocol_misc.c:88
+#: src/protocol_misc.c:90
 #, c-format
 msgid "Error message from %s (%s): %d: %s"
 msgstr "Foutmelding van %s (%s): %d: %s"
@@ -850,12 +869,12 @@ msgstr " %s eigenaar %s"
 msgid "End of subnet list."
 msgstr "Einde van subnet lijst."
 
-#: src/tincd.c:108
+#: src/tincd.c:109
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Probeer `%s --help' voor meer informatie.\n"
 
-#: src/tincd.c:111
+#: src/tincd.c:112
 #, c-format
 msgid ""
 "Usage: %s [option]...\n"
@@ -864,7 +883,7 @@ msgstr ""
 "Gebruik: %s [optie]...\n"
 "\n"
 
-#: src/tincd.c:112
+#: src/tincd.c:113
 #, c-format
 msgid ""
 "  -c, --config=DIR           Read configuration options from DIR.\n"
@@ -894,14 +913,14 @@ msgstr ""
 "      --version              Geef versie informatie en beëindig.\n"
 "\n"
 
-#: src/tincd.c:123
+#: src/tincd.c:124
 #, c-format
 msgid "Report bugs to tinc@tinc-vpn.org.\n"
 msgstr ""
 "Meld fouten in het programma aan tinc@tinc-vpn.org;\n"
 "Meld fouten in de vertaling aan vertaling@nl.linux.org.\n"
 
-#: src/tincd.c:179
+#: src/tincd.c:180
 #, c-format
 msgid ""
 "Invalid argument `%s'; SIGNAL must be a number or one of HUP, TERM, KILL, "
@@ -910,7 +929,7 @@ msgstr ""
 "Ongeldig argument `%s'; SIGNAAL moet een getal zijn of één van HUP, TERM, "
 "KILL, USR1, USR2, WINCH, INT of ALRM.\n"
 
-#: src/tincd.c:201
+#: src/tincd.c:202
 #, c-format
 msgid ""
 "Invalid argument `%s'; BITS must be a number equal to or greater than 512.\n"
@@ -918,26 +937,26 @@ msgstr ""
 "Ongeldig argument `%s'; BITS moet een nummer zijn gelijk aan of groter dan "
 "512.\n"
 
-#: src/tincd.c:294
+#: src/tincd.c:295
 #, c-format
 msgid "Generating %d bits keys:\n"
 msgstr "Bezig met genereren van een %d bits sleutel:\n"
 
-#: src/tincd.c:298
+#: src/tincd.c:299
 #, c-format
 msgid "Error during key generation!\n"
 msgstr "Fout tijdens genereren sleutel!\n"
 
-#: src/tincd.c:301
+#: src/tincd.c:302
 #, c-format
 msgid "Done.\n"
 msgstr "Klaar.\n"
 
-#: src/tincd.c:304
+#: src/tincd.c:305
 msgid "private RSA key"
 msgstr "geheime RSA sleutel"
 
-#: src/tincd.c:315 src/tincd.c:334
+#: src/tincd.c:316 src/tincd.c:335
 #, c-format
 msgid ""
 "Appending key to existing contents.\n"
@@ -946,31 +965,31 @@ msgstr ""
 "Sleutel wordt toegevoegd aan bestaande inhoud.\n"
 "Let er op dat er slechts één sleutel in het bestand is.\n"
 
-#: src/tincd.c:328
+#: src/tincd.c:329
 msgid "public RSA key"
 msgstr "openbare RSA sleutel"
 
-#: src/tincd.c:387
+#: src/tincd.c:388
 msgid "Both netname and configuration directory given, using the latter..."
 msgstr ""
 "Zowel netnaam als configuratiemap zijn gegeven, laatste wordt gebruikt..."
 
-#: src/tincd.c:408
+#: src/tincd.c:409
 #, c-format
 msgid "%s version %s (built %s %s, protocol %d)\n"
 msgstr "%s versie %s (gemaakt %s %s, protocol %d)\n"
 
-#: src/tincd.c:410
+#: src/tincd.c:411
 #, c-format
 msgid ""
-"Copyright (C) 1998-2005 Ivo Timmermans, Guus Sliepen and others.\n"
+"Copyright (C) 1998-2006 Ivo Timmermans, Guus Sliepen and others.\n"
 "See the AUTHORS file for a complete list.\n"
 "\n"
 "tinc comes with ABSOLUTELY NO WARRANTY.  This is free software,\n"
 "and you are welcome to redistribute it under certain conditions;\n"
 "see the file COPYING for details.\n"
 msgstr ""
-"Copyright (C) 1998-2005 Ivo Timmermans, Guus Sliepen en anderen.\n"
+"Copyright (C) 1998-2006 Ivo Timmermans, Guus Sliepen en anderen.\n"
 "Zie het bestand AUTHORS voor een volledige lijst.\n"
 "\n"
 "tinc wordt gedistribueerd ZONDER ENIGE GARANTIE.  Dit is vrije "
@@ -978,15 +997,15 @@ msgstr ""
 "en je bent welkom om het te distribueren onder bepaalde voorwaarden;\n"
 "zie het bestand COPYING voor details.\n"
 
-#: src/tincd.c:438
+#: src/tincd.c:439
 msgid "mlockall() not supported on this platform!"
 msgstr "mlockall() wordt niet ondersteund op dit platform!"
 
-#: src/tincd.c:462
+#: src/tincd.c:466
 msgid "Error initializing LZO compressor!"
 msgstr "Fout tijdens initialiseren LZO compressor!"
 
-#: src/tincd.c:503
+#: src/tincd.c:507
 msgid "Terminating"
 msgstr "Beëindigen"
 

src/bsd/device.c

@@ -1,7 +1,7 @@
 /*
     device.c -- Interaction BSD tun/tap device
-    Copyright (C) 2001-2005 Ivo Timmermans <ivo@tinc-vpn.org>,
+    Copyright (C) 2001-2005 Ivo Timmermans,
-                  2001-2005 Guus Sliepen <guus@tinc-vpn.org>
+                  2001-2006 Guus Sliepen <guus@tinc-vpn.org>
 
     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

src/conf.c

@@ -1,9 +1,9 @@
 /*
     conf.c -- configuration code
     Copyright (C) 1998 Robert van der Meulen
-                  1998-2005 Ivo Timmermans <ivo@tinc-vpn.org>
+                  1998-2005 Ivo Timmermans
-                  2000-2005 Guus Sliepen <guus@tinc-vpn.org>
+                  2000-2006 Guus Sliepen <guus@tinc-vpn.org>
-		  2000 Cris van Pelt <tribbel@arise.dhs.org>
+		  2000 Cris van Pelt
 
     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

src/conf.h

@@ -1,7 +1,7 @@
 /*
     conf.h -- header for conf.c
-    Copyright (C) 1998-2005 Ivo Timmermans <ivo@tinc-vpn.org>
+    Copyright (C) 1998-2005 Ivo Timmermans
-                  2000-2005 Guus Sliepen <guus@tinc-vpn.org>
+                  2000-2006 Guus Sliepen <guus@tinc-vpn.org>
 
     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

src/connection.c

@@ -1,7 +1,7 @@
 /*
     connection.c -- connection list management
-    Copyright (C) 2000-2005 Guus Sliepen <guus@tinc-vpn.org>,
+    Copyright (C) 2000-2006 Guus Sliepen <guus@tinc-vpn.org>,
-                  2000-2005 Ivo Timmermans <ivo@tinc-vpn.org>
+                  2000-2005 Ivo Timmermans
 
     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

src/connection.h

@@ -1,7 +1,7 @@
 /*
     connection.h -- header for connection.c
-    Copyright (C) 2000-2005 Guus Sliepen <guus@tinc-vpn.org>,
+    Copyright (C) 2000-2006 Guus Sliepen <guus@tinc-vpn.org>,
-                  2000-2005 Ivo Timmermans <ivo@tinc-vpn.org>
+                  2000-2005 Ivo Timmermans
 
     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

src/cygwin/device.c

@@ -1,7 +1,7 @@
 /*
     device.c -- Interaction with Windows tap driver in a Cygwin environment
-    Copyright (C) 2002-2005 Ivo Timmermans <ivo@tinc-vpn.org>,
+    Copyright (C) 2002-2005 Ivo Timmermans,
-                  2002-2005 Guus Sliepen <guus@tinc-vpn.org>
+                  2002-2006 Guus Sliepen <guus@tinc-vpn.org>
 
     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

src/device.h

@@ -1,7 +1,7 @@
 /*
     net.h -- generic header for device.c
     Copyright (C) 2001-2005 Ivo Timmermans <zarq@iname.com>
-                  2001-2005 Guus Sliepen <guus@tinc-vpn.org>
+                  2001-2006 Guus Sliepen <guus@tinc-vpn.org>
 
     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

src/edge.c

@@ -1,7 +1,7 @@
 /*
     edge.c -- edge tree management
-    Copyright (C) 2000-2005 Guus Sliepen <guus@tinc-vpn.org>,
+    Copyright (C) 2000-2006 Guus Sliepen <guus@tinc-vpn.org>,
-                  2000-2005 Ivo Timmermans <ivo@tinc-vpn.org>
+                  2000-2005 Ivo Timmermans
 
     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

src/edge.h

@@ -1,7 +1,7 @@
 /*
     edge.h -- header for edge.c
-    Copyright (C) 2001-2005 Guus Sliepen <guus@tinc-vpn.org>,
+    Copyright (C) 2001-2006 Guus Sliepen <guus@tinc-vpn.org>,
-                  2001-2005 Ivo Timmermans <ivo@tinc-vpn.org>
+                  2001-2005 Ivo Timmermans
 
     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

src/event.c

@@ -1,7 +1,7 @@
 /*
     event.c -- event queue
-    Copyright (C) 2002-2005 Guus Sliepen <guus@tinc-vpn.org>,
+    Copyright (C) 2002-2006 Guus Sliepen <guus@tinc-vpn.org>,
-                  2002-2005 Ivo Timmermans <ivo@tinc-vpn.org>
+                  2002-2005 Ivo Timmermans
 
     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

src/event.h

@@ -1,7 +1,7 @@
 /*
     event.h -- header for event.c
-    Copyright (C) 2002-2005 Guus Sliepen <guus@tinc-vpn.org>,
+    Copyright (C) 2002-2006 Guus Sliepen <guus@tinc-vpn.org>,
-                  2002-2005 Ivo Timmermans <ivo@tinc-vpn.org>
+                  2002-2005 Ivo Timmermans
 
     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

src/graph.c

@@ -1,7 +1,7 @@
 /*
     graph.c -- graph algorithms
-    Copyright (C) 2001-2005 Guus Sliepen <guus@tinc-vpn.org>,
+    Copyright (C) 2001-2006 Guus Sliepen <guus@tinc-vpn.org>,
-                  2001-2005 Ivo Timmermans <ivo@tinc-vpn.org>
+                  2001-2005 Ivo Timmermans
 
     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

src/graph.h

@@ -1,7 +1,7 @@
 /*
     graph.h -- header for graph.c
-    Copyright (C) 2001-2005 Guus Sliepen <guus@tinc-vpn.org>,
+    Copyright (C) 2001-2006 Guus Sliepen <guus@tinc-vpn.org>,
-                  2001-2005 Ivo Timmermans <ivo@tinc-vpn.org>
+                  2001-2005 Ivo Timmermans
 
     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

src/linux/device.c

@@ -1,7 +1,7 @@
 /*
     device.c -- Interaction with Linux ethertap and tun/tap device
-    Copyright (C) 2001-2005 Ivo Timmermans <ivo@tinc-vpn.org>,
+    Copyright (C) 2001-2005 Ivo Timmermans,
-                  2001-2005 Guus Sliepen <guus@tinc-vpn.org>
+                  2001-2006 Guus Sliepen <guus@tinc-vpn.org>
 
     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

src/logger.c

@@ -1,7 +1,7 @@
 /*
     logger.c -- logging code
-    Copyright (C) 2004-2005 Guus Sliepen <guus@tinc-vpn.org>
+    Copyright (C) 2004-2006 Guus Sliepen <guus@tinc-vpn.org>
-                  2004-2005 Ivo Timmermans <ivo@tinc-vpn.org>
+                  2004-2005 Ivo Timmermans
 
     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

src/meta.c

@@ -1,7 +1,7 @@
 /*
     meta.c -- handle the meta communication
-    Copyright (C) 2000-2005 Guus Sliepen <guus@tinc-vpn.org>,
+    Copyright (C) 2000-2006 Guus Sliepen <guus@tinc-vpn.org>,
-                  2000-2005 Ivo Timmermans <ivo@tinc-vpn.org>
+                  2000-2005 Ivo Timmermans
 
     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

src/meta.h

@@ -1,7 +1,7 @@
 /*
     meta.h -- header for meta.c
-    Copyright (C) 2000-2005 Guus Sliepen <guus@tinc-vpn.org>,
+    Copyright (C) 2000-2006 Guus Sliepen <guus@tinc-vpn.org>,
-                  2000-2005 Ivo Timmermans <ivo@tinc-vpn.org>
+                  2000-2005 Ivo Timmermans
 
     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

src/mingw/device.c

@@ -1,7 +1,7 @@
 /*
     device.c -- Interaction with Windows tap driver in a MinGW environment
-    Copyright (C) 2002-2005 Ivo Timmermans <ivo@tinc-vpn.org>,
+    Copyright (C) 2002-2005 Ivo Timmermans,
-                  2002-2005 Guus Sliepen <guus@tinc-vpn.org>
+                  2002-2006 Guus Sliepen <guus@tinc-vpn.org>
 
     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

src/net.c

@@ -1,7 +1,7 @@
 /*
     net.c -- most of the network code
-    Copyright (C) 1998-2005 Ivo Timmermans <ivo@tinc-vpn.org>,
+    Copyright (C) 1998-2005 Ivo Timmermans,
-                  2000-2005 Guus Sliepen <guus@tinc-vpn.org>
+                  2000-2006 Guus Sliepen <guus@tinc-vpn.org>
 
     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

src/net.h

@@ -1,7 +1,7 @@
 /*
     net.h -- header for net.c
     Copyright (C) 1998-2005 Ivo Timmermans <zarq@iname.com>
-                  2000-2005 Guus Sliepen <guus@tinc-vpn.org>
+                  2000-2006 Guus Sliepen <guus@tinc-vpn.org>
 
     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

src/net_packet.c

@@ -1,7 +1,7 @@
 /*
     net_packet.c -- Handles in- and outgoing VPN packets
-    Copyright (C) 1998-2005 Ivo Timmermans <ivo@tinc-vpn.org>,
+    Copyright (C) 1998-2005 Ivo Timmermans,
-                  2000-2005 Guus Sliepen <guus@tinc-vpn.org>
+                  2000-2006 Guus Sliepen <guus@tinc-vpn.org>
 
     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

src/net_setup.c

@@ -1,7 +1,7 @@
 /*
     net_setup.c -- Setup.
-    Copyright (C) 1998-2005 Ivo Timmermans <ivo@tinc-vpn.org>,
+    Copyright (C) 1998-2005 Ivo Timmermans,
-                  2000-2005 Guus Sliepen <guus@tinc-vpn.org>
+                  2000-2006 Guus Sliepen <guus@tinc-vpn.org>
 
     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

src/net_socket.c

@@ -1,7 +1,7 @@
 /*
     net_socket.c -- Handle various kinds of sockets.
-    Copyright (C) 1998-2005 Ivo Timmermans <ivo@tinc-vpn.org>,
+    Copyright (C) 1998-2005 Ivo Timmermans,
-                  2000-2005 Guus Sliepen <guus@tinc-vpn.org>
+                  2000-2006 Guus Sliepen <guus@tinc-vpn.org>
 
     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

src/netutl.c

@@ -1,7 +1,7 @@
 /*
     netutl.c -- some supporting network utility code
-    Copyright (C) 1998-2005 Ivo Timmermans <ivo@tinc-vpn.org>
+    Copyright (C) 1998-2005 Ivo Timmermans
-                  2000-2005 Guus Sliepen <guus@tinc-vpn.org>
+                  2000-2006 Guus Sliepen <guus@tinc-vpn.org>
 
     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

src/netutl.h

@@ -1,7 +1,7 @@
 /*
     netutl.h -- header file for netutl.c
     Copyright (C) 1998-2005 Ivo Timmermans <zarq@iname.com>
-                  2000-2005 Guus Sliepen <guus@tinc-vpn.org>
+                  2000-2006 Guus Sliepen <guus@tinc-vpn.org>
 
     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

src/node.c

@@ -1,7 +1,7 @@
 /*
     node.c -- node tree management
-    Copyright (C) 2001-2005 Guus Sliepen <guus@tinc-vpn.org>,
+    Copyright (C) 2001-2006 Guus Sliepen <guus@tinc-vpn.org>,
-                  2001-2005 Ivo Timmermans <ivo@tinc-vpn.org>
+                  2001-2005 Ivo Timmermans
 
     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

src/node.h

@@ -1,7 +1,7 @@
 /*
     node.h -- header for node.c
-    Copyright (C) 2001-2005 Guus Sliepen <guus@tinc-vpn.org>,
+    Copyright (C) 2001-2006 Guus Sliepen <guus@tinc-vpn.org>,
-                  2001-2005 Ivo Timmermans <ivo@tinc-vpn.org>
+                  2001-2005 Ivo Timmermans
 
     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

src/process.c

@@ -1,7 +1,7 @@
 /*
     process.c -- process management functions
-    Copyright (C) 1999-2005 Ivo Timmermans <ivo@tinc-vpn.org>,
+    Copyright (C) 1999-2005 Ivo Timmermans,
-                  2000-2005 Guus Sliepen <guus@tinc-vpn.org>
+                  2000-2006 Guus Sliepen <guus@tinc-vpn.org>
 
     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

src/process.h

@@ -1,7 +1,7 @@
 /*
     process.h -- header file for process.c
-    Copyright (C) 1999-2005 Ivo Timmermans <ivo@tinc-vpn.org>,
+    Copyright (C) 1999-2005 Ivo Timmermans,
-                  2000-2005 Guus Sliepen <guus@tinc-vpn.org>
+                  2000-2006 Guus Sliepen <guus@tinc-vpn.org>
 
     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

src/protocol.c

@@ -1,7 +1,7 @@
 /*
     protocol.c -- handle the meta-protocol, basic functions
-    Copyright (C) 1999-2005 Ivo Timmermans <ivo@tinc-vpn.org>,
+    Copyright (C) 1999-2005 Ivo Timmermans,
-                  2000-2005 Guus Sliepen <guus@tinc-vpn.org>
+                  2000-2006 Guus Sliepen <guus@tinc-vpn.org>
 
     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

src/protocol.h

@@ -1,7 +1,7 @@
 /*
     protocol.h -- header for protocol.c
-    Copyright (C) 1999-2005 Ivo Timmermans <ivo@tinc-vpn.org>,
+    Copyright (C) 1999-2005 Ivo Timmermans,
-                  2000-2005 Guus Sliepen <guus@tinc-vpn.org>
+                  2000-2006 Guus Sliepen <guus@tinc-vpn.org>
 
     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

src/protocol_auth.c

@@ -1,7 +1,7 @@
 /*
     protocol_auth.c -- handle the meta-protocol, authentication
-    Copyright (C) 1999-2005 Ivo Timmermans <ivo@tinc-vpn.org>,
+    Copyright (C) 1999-2005 Ivo Timmermans,
-                  2000-2005 Guus Sliepen <guus@tinc-vpn.org>
+                  2000-2006 Guus Sliepen <guus@tinc-vpn.org>
 
     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

src/protocol_edge.c

@@ -1,7 +1,7 @@
 /*
     protocol_edge.c -- handle the meta-protocol, edges
-    Copyright (C) 1999-2005 Ivo Timmermans <ivo@tinc-vpn.org>,
+    Copyright (C) 1999-2005 Ivo Timmermans,
-                  2000-2005 Guus Sliepen <guus@tinc-vpn.org>
+                  2000-2006 Guus Sliepen <guus@tinc-vpn.org>
 
     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

src/protocol_key.c

@@ -1,7 +1,7 @@
 /*
     protocol_key.c -- handle the meta-protocol, key exchange
-    Copyright (C) 1999-2005 Ivo Timmermans <ivo@tinc-vpn.org>,
+    Copyright (C) 1999-2005 Ivo Timmermans,
-                  2000-2005 Guus Sliepen <guus@tinc-vpn.org>
+                  2000-2006 Guus Sliepen <guus@tinc-vpn.org>
 
     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

src/protocol_misc.c

@@ -1,7 +1,7 @@
 /*
     protocol_misc.c -- handle the meta-protocol, miscellaneous functions
-    Copyright (C) 1999-2005 Ivo Timmermans <ivo@tinc-vpn.org>,
+    Copyright (C) 1999-2005 Ivo Timmermans,
-                  2000-2005 Guus Sliepen <guus@tinc-vpn.org>
+                  2000-2006 Guus Sliepen <guus@tinc-vpn.org>
 
     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

src/protocol_subnet.c

@@ -1,7 +1,7 @@
 /*
     protocol_subnet.c -- handle the meta-protocol, subnets
-    Copyright (C) 1999-2005 Ivo Timmermans <ivo@tinc-vpn.org>,
+    Copyright (C) 1999-2005 Ivo Timmermans,
-                  2000-2005 Guus Sliepen <guus@tinc-vpn.org>
+                  2000-2006 Guus Sliepen <guus@tinc-vpn.org>
 
     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

src/raw_socket/device.c

@@ -1,7 +1,7 @@
 /*
     device.c -- raw socket
-    Copyright (C) 2002-2005 Ivo Timmermans <ivo@tinc-vpn.org>,
+    Copyright (C) 2002-2005 Ivo Timmermans,
-                  2002-2005 Guus Sliepen <guus@tinc-vpn.org>
+                  2002-2006 Guus Sliepen <guus@tinc-vpn.org>
 
     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

src/route.c

@@ -1,7 +1,7 @@
 /*
     route.c -- routing
-    Copyright (C) 2000-2005 Ivo Timmermans <ivo@tinc-vpn.org>,
+    Copyright (C) 2000-2005 Ivo Timmermans,
-                  2000-2005 Guus Sliepen <guus@tinc-vpn.org>
+                  2000-2006 Guus Sliepen <guus@tinc-vpn.org>
 
     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

src/route.h

@@ -1,7 +1,7 @@
 /*
     route.h -- header file for route.c
     Copyright (C) 2000-2005 Ivo Timmermans <zarq@iname.com>
-                  2000-2005 Guus Sliepen <guus@tinc-vpn.org>         
+                  2000-2006 Guus Sliepen <guus@tinc-vpn.org>         
 
     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

src/solaris/device.c

@@ -1,7 +1,7 @@
 /*
     device.c -- Interaction with Solaris tun device
-    Copyright (C) 2001-2005 Ivo Timmermans <ivo@tinc-vpn.org>,
+    Copyright (C) 2001-2005 Ivo Timmermans,
-                  2001-2005 Guus Sliepen <guus@tinc-vpn.org>
+                  2001-2006 Guus Sliepen <guus@tinc-vpn.org>
 
     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

src/subnet.c

@@ -1,7 +1,7 @@
 /*
     subnet.c -- handle subnet lookups and lists
-    Copyright (C) 2000-2005 Guus Sliepen <guus@tinc-vpn.org>,
+    Copyright (C) 2000-2006 Guus Sliepen <guus@tinc-vpn.org>,
-                  2000-2005 Ivo Timmermans <ivo@tinc-vpn.org>
+                  2000-2005 Ivo Timmermans
 
     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

src/subnet.h

@@ -1,7 +1,7 @@
 /*
     subnet.h -- header for subnet.c
-    Copyright (C) 2000-2005 Guus Sliepen <guus@tinc-vpn.org>,
+    Copyright (C) 2000-2006 Guus Sliepen <guus@tinc-vpn.org>,
-                  2000-2005 Ivo Timmermans <ivo@tinc-vpn.org>
+                  2000-2005 Ivo Timmermans
 
     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

src/tincd.c

@@ -1,7 +1,7 @@
 /*
     tincd.c -- the main file for tincd
-    Copyright (C) 1998-2005 Ivo Timmermans <ivo@tinc-vpn.org>
+    Copyright (C) 1998-2005 Ivo Timmermans
-                  2000-2005 Guus Sliepen <guus@tinc-vpn.org>
+                  2000-2006 Guus Sliepen <guus@tinc-vpn.org>
 
     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
@@ -408,7 +408,7 @@ int main(int argc, char **argv)
 	if(show_version) {
 		printf(_("%s version %s (built %s %s, protocol %d)\n"), PACKAGE,
 			   VERSION, __DATE__, __TIME__, PROT_CURRENT);
-		printf(_("Copyright (C) 1998-2005 Ivo Timmermans, Guus Sliepen and others.\n"
+		printf(_("Copyright (C) 1998-2006 Ivo Timmermans, Guus Sliepen and others.\n"
 				"See the AUTHORS file for a complete list.\n\n"
 				"tinc comes with ABSOLUTELY NO WARRANTY.  This is free software,\n"
 				"and you are welcome to redistribute it under certain conditions;\n"

src/uml_socket/device.c

@@ -1,7 +1,7 @@
 /*
     device.c -- UML network socket
-    Copyright (C) 2002-2005 Ivo Timmermans <ivo@tinc-vpn.org>,
+    Copyright (C) 2002-2005 Ivo Timmermans,
-                  2002-2005 Guus Sliepen <guus@tinc-vpn.org>
+                  2002-2006 Guus Sliepen <guus@tinc-vpn.org>
 
     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

system.h

@@ -1,7 +1,7 @@
 /*
     system.h -- system headers
-    Copyright (C) 1998-2005 Ivo Timmermans <ivo@tinc-vpn.org>
+    Copyright (C) 1998-2005 Ivo Timmermans
-                  2003-2005 Guus Sliepen <guus@tinc-vpn.org>
+                  2003-2006 Guus Sliepen <guus@tinc-vpn.org>
 
     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