projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Big bad commit:
[tinc]
/
src
/
tincd.c
diff --git
a/src/tincd.c
b/src/tincd.c
index
8eeef1d
..
b790d7a
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.5
2 2001/09/01 12:36:53
guus Exp $
+ $Id: tincd.c,v 1.10.4.5
3 2001/10/27 12:13:17
guus Exp $
*/
#include "config.h"
*/
#include "config.h"
@@
-205,7
+205,7
@@
int keygen(int bits)
{
RSA *rsa_key;
FILE *f;
{
RSA *rsa_key;
FILE *f;
- c
onfig_t const *cfg
;
+ c
har *name = NULL
;
char *filename;
fprintf(stderr, _("Generating %d bits keys:\n"), bits);
char *filename;
fprintf(stderr, _("Generating %d bits keys:\n"), bits);
@@
-219,8
+219,10
@@
int keygen(int bits)
else
fprintf(stderr, _("Done.\n"));
else
fprintf(stderr, _("Done.\n"));
- if(config && (cfg = get_config_val(config, config_name)))
- asprintf(&filename, "%s/hosts/%s", confbase, cfg->data.ptr);
+ get_config_string(lookup_config(config_tree, "Name"), &name);
+
+ if(name)
+ asprintf(&filename, "%s/hosts/%s", confbase, name);
else
asprintf(&filename, "%s/rsa_key.pub", confbase);
else
asprintf(&filename, "%s/rsa_key.pub", confbase);
@@
-350,8
+352,8
@@
cp
if(do_detach)
{
if(do_detach)
{
- syslog(LOG_NOTICE, _("Restarting in %d seconds!"),
MAXTIMEOUT
);
- sleep(
MAXTIMEOUT
);
+ syslog(LOG_NOTICE, _("Restarting in %d seconds!"),
maxtimeout
);
+ sleep(
maxtimeout
);
}
else
{
}
else
{