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.43 2001/02/25 14:51:42 guus Exp $
+ $Id: tincd.c,v 1.10.4.47 2001/06/05 16:09:55 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;
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");
+ asprintf(&filename, "%s/rsa_key.priv", confbase);
if((f = ask_and_safe_open(filename, _("public RSA key"), "a")) == NULL)
return -1;
bindtextdomain (PACKAGE, LOCALEDIR);
textdomain (PACKAGE);
- /* Do some intl stuff right now */
-
- unknown = _("unknown");
-
environment = envp;
parse_options(argc, argv, envp);
return 1;
}
- openlog("tinc", LOG_PERROR, LOG_DAEMON); /* Catch all syslog() calls issued before detaching */
+#ifdef HAVE_SOLARIS
+ openlog("tinc", LOG_CONS, LOG_DAEMON); /* Catch all syslog() calls issued before detaching */
+#else
+ openlog("tinc", LOG_PERROR, LOG_DAEMON); /* Catch all syslog() calls issued before detaching */
+#endif
g_argv = argv;
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);
}
}
}
-