/*
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
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.39 2001/01/05 23:53:53 guus Exp $
+ $Id: tincd.c,v 1.10.4.45 2001/03/01 21:32:04 guus Exp $
*/
#include "config.h"
/* If nonzero, it will attempt to kill a running tincd and exit. */
static int kill_tincd = 0;
-/* If zero, don't detach from the terminal. */
-extern int do_detach;
-
/* If nonzero, generate public/private keypair for this host/net. */
static int generate_keys = 0;
{
RSA *rsa_key;
FILE *f;
+ config_t const *cfg;
+ char *filename;
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!"));
else
fprintf(stderr, _("Done.\n"));
- if((f = ask_and_safe_open("rsa_key.pub", _("public RSA key"))) == NULL)
+ if(config && (cfg = get_config_val(config, config_name)))
+ asprintf(&filename, "%s/hosts/%s", confbase, cfg->data.ptr);
+ else
+ asprintf(&filename, "%s/rsa_key.priv", confbase);
+
+ if((f = ask_and_safe_open(filename, _("public RSA key"), "a")) == NULL)
return -1;
+
+ if(ftell(f))
+ fprintf(stderr, _("Appending key to existing contents.\nMake sure only one key is stored in the file.\n"));
+
PEM_write_RSAPublicKey(f, rsa_key);
fclose(f);
+ free(filename);
- if((f = ask_and_safe_open("rsa_key.priv", _("private RSA key"))) == NULL)
+ asprintf(&filename, "%s/rsa_key.priv", confbase);
+ if((f = ask_and_safe_open(filename, _("private RSA key"), "a")) == NULL)
return -1;
+
+ if(ftell(f))
+ fprintf(stderr, _("Appending key to existing contents.\nMake sure only one key is stored in the file.\n"));
+
PEM_write_RSAPrivateKey(f, rsa_key, NULL, NULL, 0, NULL, NULL);
fclose(f);
+ free(filename);
return 0;
}
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);
}
int
main(int argc, char **argv, char **envp)
{
- openlog("tinc", LOG_PERROR, LOG_DAEMON); /* Catch all syslog() calls issued before detaching */
-
program_name = argv[0];
setlocale (LC_ALL, "");
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"
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;
}
+ openlog("tinc", LOG_PERROR, LOG_DAEMON); /* Catch all syslog() calls issued before detaching */
+
g_argv = argv;
make_names();
RAND_load_file("/dev/urandom", 1024);
cp
if(generate_keys)
- exit(keygen(generate_keys));
-
+ {
+ read_server_config();
+ exit(keygen(generate_keys));
+ }
+
if(kill_tincd)
exit(kill_other());
if(read_server_config())
- return 1;
+ exit(1);
cp
if(detach())
exit(0);
else
{
syslog(LOG_ERR, _("Not restarting."));
- exit(0);
+ exit(1);
}
}
}
-