X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Ftincd.c;h=6fa878532e80a9e3ec2b814f02e78e501ddcdf5b;hp=c2660fa3140e367967b5e650783496ea61c6a065;hb=6698f7c390a5ae2f262e30560d9df59f9d5c418d;hpb=23730375f27c32e0fe1a59c7a761dd85296a7a4a

diff --git a/src/tincd.c b/src/tincd.c
index c2660fa3..6fa87853 100644
--- a/src/tincd.c
+++ b/src/tincd.c
@@ -1,7 +1,7 @@
 /*
     tincd.c -- the main file for tincd
     Copyright (C) 1998-2005 Ivo Timmermans
-                  2000-2008 Guus Sliepen <guus@tinc-vpn.org>
+                  2000-2009 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
@@ -423,7 +423,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-2008 Ivo Timmermans, Guus Sliepen and others.\n"
+		printf(_("Copyright (C) 1998-2009 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"
@@ -500,13 +500,16 @@ int main2(int argc, char **argv)
 
 	if(!detach())
 		return 1;
-		
 
 	/* Setup sockets and open device. */
 
-	if(!setup_network_connections())
+	if(!setup_network())
 		goto end;
 
+	/* Initiate all outgoing connections. */
+
+	try_outgoing_connections();
+
 	/* Start main loop. It only exits when tinc is killed. */
 
 	status = main_loop();