projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
- It's 2001, all copyright notices are updated.
[tinc]
/
src
/
tincd.c
diff --git
a/src/tincd.c
b/src/tincd.c
index
7a65aad
..
8eb0be5
100644
(file)
--- a/
src/tincd.c
+++ b/
src/tincd.c
@@
-1,7
+1,7
@@
/*
tincd.c -- the main file for tincd
/*
tincd.c -- the main file for tincd
- Copyright (C) 1998
,1999,2000
Ivo Timmermans <itimmermans@bigfoot.com>
-
2000
Guus Sliepen <guus@sliepen.warande.net>
+ Copyright (C) 1998
-2001
Ivo Timmermans <itimmermans@bigfoot.com>
+
2000,2001
Guus Sliepen <guus@sliepen.warande.net>
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
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
@@
-17,7
+17,7
@@
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
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.
36 2000/11/28 23:12:57 zarq
Exp $
+ $Id: tincd.c,v 1.10.4.
41 2001/01/07 17:09:07 guus
Exp $
*/
#include "config.h"
*/
#include "config.h"
@@
-153,7
+153,10
@@
parse_options(int argc, char **argv, char **envp)
do_detach = 0;
break;
case 'd': /* inc debug level */
do_detach = 0;
break;
case 'd': /* inc debug level */
- debug_lvl++;
+ if(optarg)
+ debug_lvl = atoi(optarg);
+ else
+ debug_lvl++;
break;
case 'k': /* kill old tincds */
kill_tincd = 1;
break;
case 'k': /* kill old tincds */
kill_tincd = 1;
@@
-168,7
+171,8
@@
parse_options(int argc, char **argv, char **envp)
generate_keys = atoi(optarg);
if(generate_keys < 512)
{
generate_keys = atoi(optarg);
if(generate_keys < 512)
{
- fprintf(stderr, _("Invalid argument! BITS must be a number equal to or greater than 512.\n"));
+ fprintf(stderr, _("Invalid argument `%s'; BITS must be a number equal to or greater than 512.\n"),
+ optarg);
usage(1);
}
generate_keys &= ~7; /* Round it to bytes */
usage(1);
}
generate_keys &= ~7; /* Round it to bytes */
@@
-225,9
+229,11
@@
int keygen(int bits)
{
RSA *rsa_key;
FILE *f;
{
RSA *rsa_key;
FILE *f;
+ char *filename;
fprintf(stderr, _("Generating %d bits keys:\n"), bits);
rsa_key = RSA_generate_key(bits, 0xFFFF, indicator, NULL);
fprintf(stderr, _("Generating %d bits keys:\n"), bits);
rsa_key = RSA_generate_key(bits, 0xFFFF, indicator, NULL);
+
if(!rsa_key)
{
fprintf(stderr, _("Error during key generation!"));
if(!rsa_key)
{
fprintf(stderr, _("Error during key generation!"));
@@
-236,15
+242,19
@@
int keygen(int bits)
else
fprintf(stderr, _("Done.\n"));
else
fprintf(stderr, _("Done.\n"));
- if((f = ask_and_safe_open("rsa_key.pub")) == NULL)
+ asprintf(&filename, "%s/rsa_key.pub", confbase);
+ if((f = ask_and_safe_open(filename, _("public RSA key"))) == NULL)
return -1;
PEM_write_RSAPublicKey(f, rsa_key);
fclose(f);
return -1;
PEM_write_RSAPublicKey(f, rsa_key);
fclose(f);
+ free(filename);
- if((f = ask_and_safe_open("rsa_key.priv")) == NULL)
+ asprintf(&filename, "%s/rsa_key.priv", confbase);
+ if((f = ask_and_safe_open(filename, _("private RSA key"))) == NULL)
return -1;
PEM_write_RSAPrivateKey(f, rsa_key, NULL, NULL, 0, NULL, NULL);
fclose(f);
return -1;
PEM_write_RSAPrivateKey(f, rsa_key, NULL, NULL, 0, NULL, NULL);
fclose(f);
+ free(filename);
return 0;
}
return 0;
}
@@
-261,7
+271,7
@@
void make_names(void)
if(!confbase)
asprintf(&confbase, "%s/tinc/%s", CONFDIR, netname);
else
if(!confbase)
asprintf(&confbase, "%s/tinc/%s", CONFDIR, netname);
else
-
fprintf(stderr, _("Both netname and configuration directory given, using the latter...\n
"));
+
syslog(LOG_INFO, _("Both netname and configuration directory given, using the latter...
"));
if(!identname)
asprintf(&identname, "tinc.%s", netname);
}
if(!identname)
asprintf(&identname, "tinc.%s", netname);
}
@@
-295,7
+305,7
@@
main(int argc, char **argv, char **envp)
if(show_version)
{
printf(_("%s version %s (built %s %s, protocol %d)\n"), PACKAGE, VERSION, __DATE__, __TIME__, PROT_CURRENT);
if(show_version)
{
printf(_("%s version %s (built %s %s, protocol %d)\n"), PACKAGE, VERSION, __DATE__, __TIME__, PROT_CURRENT);
- printf(_("Copyright (C) 1998
,1999,2000
Ivo Timmermans, Guus Sliepen and others.\n"
+ printf(_("Copyright (C) 1998
-2001
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 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"
@@
-309,18
+319,20
@@
main(int argc, char **argv, char **envp)
if(geteuid())
{
if(geteuid())
{
- fprintf(stderr, _("You must be root to run this program.
Sorry.
\n"));
+ fprintf(stderr, _("You must be root to run this program.\n"));
return 1;
}
return 1;
}
+ openlog("tinc", LOG_PERROR, LOG_DAEMON); /* Catch all syslog() calls issued before detaching */
+
g_argv = argv;
make_names();
/* Slllluuuuuuurrrrp! */
g_argv = argv;
make_names();
/* Slllluuuuuuurrrrp! */
-
+cp
RAND_load_file("/dev/urandom", 1024);
RAND_load_file("/dev/urandom", 1024);
-
+cp
if(generate_keys)
exit(keygen(generate_keys));
if(generate_keys)
exit(keygen(generate_keys));
@@
-329,10
+341,10
@@
main(int argc, char **argv, char **envp)
if(read_server_config())
return 1;
if(read_server_config())
return 1;
-
+cp
if(detach())
exit(0);
if(detach())
exit(0);
-
+cp
if(debug_lvl >= DEBUG_ERROR)
ERR_load_crypto_strings();
if(debug_lvl >= DEBUG_ERROR)
ERR_load_crypto_strings();