X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Ftincd.c;h=7619af552cbc8ef1369f5f79b2be6d004284a5a4;hp=3c1a608affb010d096147a6bd5753602fd613348;hb=8d393b30a922110ec77d5b243347416b50cd2160;hpb=7926a156e5b118d06295228e57de0cc9de0433b4

diff --git a/src/tincd.c b/src/tincd.c
index 3c1a608a..7619af55 100644
--- a/src/tincd.c
+++ b/src/tincd.c
@@ -1,7 +1,7 @@
 /*
     tincd.c -- the main file for tincd
-    Copyright (C) 1998-2004 Ivo Timmermans <ivo@tinc-vpn.org>
-                  2000-2004 Guus Sliepen <guus@tinc-vpn.org>
+    Copyright (C) 1998-2005 Ivo Timmermans
+                  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
@@ -35,11 +35,17 @@
 #include <openssl/rsa.h>
 #include <openssl/pem.h>
 #include <openssl/evp.h>
+#include <openssl/engine.h>
 
+#ifdef HAVE_LZO_LZO1X_H
+#include <lzo/lzo1x.h>
+#endif
+#ifdef HAVE_LZO1X_H
 #include <lzo1x.h>
+#endif
 
 #include <getopt.h>
-#include <pidfile.h>
+#include "pidfile.h"
 
 #include "conf.h"
 #include "device.h"
@@ -407,7 +413,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-2004 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"
@@ -448,6 +454,9 @@ int main(int argc, char **argv)
 
 	RAND_load_file("/dev/urandom", 1024);
 
+	ENGINE_load_builtin_engines();
+	ENGINE_register_all_complete();
+
 	OpenSSL_add_all_algorithms();
 
 	if(generate_keys) {
@@ -505,6 +514,8 @@ end:
 #ifndef HAVE_MINGW
 	remove_pid(pidfilename);
 #endif
+
+	EVP_cleanup();
 	
 	return status;
 }