X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Ftincd.c;h=1a5677f1295c264eb94fca71bdc38d7fd61f3379;hp=a37a61253a5bab3a9f9508b62ec2d37f1dcf1565;hb=5900c07fab39d2833ea66429ad652ca49a91a508;hpb=bb2f18a3fc8acb7802f30e06153def30eb97a994

diff --git a/src/tincd.c b/src/tincd.c
index a37a6125..1a5677f1 100644
--- a/src/tincd.c
+++ b/src/tincd.c
@@ -17,7 +17,7 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id: tincd.c,v 1.10.4.84 2003/08/08 19:45:21 guus Exp $
+    $Id: tincd.c,v 1.10.4.89 2003/10/06 16:13:08 guus Exp $
 */
 
 #include "system.h"
@@ -39,6 +39,7 @@
 #include <lzo1x.h>
 
 #include <getopt.h>
+#include <pidfile.h>
 
 #include "conf.h"
 #include "device.h"
@@ -291,7 +292,7 @@ static bool keygen(int bits)
 	char *filename;
 
 	fprintf(stderr, _("Generating %d bits keys:\n"), bits);
-	rsa_key = RSA_generate_key(bits, 0xFFFF, indicator, NULL);
+	rsa_key = RSA_generate_key(bits, 0x10001, indicator, NULL);
 
 	if(!rsa_key) {
 		fprintf(stderr, _("Error during key generation!\n"));
@@ -300,11 +301,16 @@ static bool keygen(int bits)
 		fprintf(stderr, _("Done.\n"));
 
 	asprintf(&filename, "%s/rsa_key.priv", confbase);
-	f = ask_and_safe_open(filename, _("private RSA key"), true, "a");
+	f = ask_and_open(filename, _("private RSA key"), "a");
 
 	if(!f)
 		return false;
-
+  
+#ifdef HAVE_FCHMOD
+	/* Make it unreadable for others. */
+	fchmod(fileno(f), 0600);
+#endif
+		
 	if(ftell(f))
 		fprintf(stderr, _("Appending key to existing contents.\nMake sure only one key is stored in the file.\n"));
 
@@ -319,7 +325,7 @@ static bool keygen(int bits)
 	else
 		asprintf(&filename, "%s/rsa_key.pub", confbase);
 
-	f = ask_and_safe_open(filename, _("public RSA key"), false, "a");
+	f = ask_and_open(filename, _("public RSA key"), "a");
 
 	if(!f)
 		return false;
@@ -353,7 +359,7 @@ static void make_names(void)
 #ifdef HAVE_MINGW
 	if(!RegOpenKeyEx(HKEY_LOCAL_MACHINE, "SOFTWARE\\tinc", 0, KEY_READ, &key)) {
 		if(!RegQueryValueEx(key, NULL, 0, 0, installdir, &len)) {
-			if(!pidfilename)
+			if(!logfilename)
 				asprintf(&logfilename, "%s/log/%s.log", identname);
 			if(!confbase) {
 				if(netname)
@@ -501,5 +507,10 @@ int main2(int argc, char **argv)
 		dump_device_stats();
 
 	logger(LOG_NOTICE, _("Terminating"));
+
+#ifndef HAVE_MINGW
+	remove_pid(pidfilename);
+#endif
+	
 	return status;
 }