projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
- Let user choose whether keys are in the config files or separate
[tinc]
/
src
/
tincd.c
diff --git
a/src/tincd.c
b/src/tincd.c
index
7a65aad
..
535fdb3
100644
(file)
--- 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.
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.3
6 2000/11/28 23:12:57 zarq
Exp $
+ $Id: tincd.c,v 1.10.4.3
9 2001/01/05 23:53:53 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 */
@@
-236,12
+240,12
@@
int keygen(int bits)
else
fprintf(stderr, _("Done.\n"));
else
fprintf(stderr, _("Done.\n"));
- if((f = ask_and_safe_open("rsa_key.pub")) == NULL)
+ if((f = ask_and_safe_open("rsa_key.pub"
, _("public RSA key")
)) == NULL)
return -1;
PEM_write_RSAPublicKey(f, rsa_key);
fclose(f);
return -1;
PEM_write_RSAPublicKey(f, rsa_key);
fclose(f);
- if((f = ask_and_safe_open("rsa_key.priv")) == NULL)
+ if((f = ask_and_safe_open("rsa_key.priv"
, _("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);
@@
-279,6
+283,8
@@
void make_names(void)
int
main(int argc, char **argv, char **envp)
{
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, "");
program_name = argv[0];
setlocale (LC_ALL, "");
@@
-318,9
+324,9
@@
main(int argc, char **argv, char **envp)
make_names();
/* Slllluuuuuuurrrrp! */
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
+335,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();