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.13 2002/04/13 10:25:38 zarq Exp $
+ $Id: tincd.c,v 1.15 2002/04/28 12:46:26 zarq Exp $
*/
#include "config.h"
#include <signal.h>
#include <stdio.h>
#include <sys/types.h>
-#include <syslog.h>
#include <unistd.h>
#include <signal.h>
#include <string.h>
# include <sys/ioctl.h>
#endif
+#ifdef USE_OPENSSL
#include <openssl/rand.h>
#include <openssl/rsa.h>
#include <openssl/pem.h>
#include <openssl/evp.h>
+#endif
+
+#ifdef USE_GCRYPT
+#include <gcrypt.h>
+#endif
#include <utils.h>
#include <xalloc.h>
#include "process.h"
#include "protocol.h"
#include "subnet.h"
+#include "logging.h"
#include "system.h"
}
}
+#ifdef USE_OPENSSL
/*
Generate a public/private RSA keypair, and ask for a file to store
them in.
return 0;
}
+#endif
/*
Set all files and paths according to netname
if(!confbase)
asprintf(&confbase, "%s/tinc/%s", CONFDIR, netname);
else
- syslog(LOG_INFO, _("Both netname and configuration directory given, using the latter..."));
+ log(0, TLOG_INFO, _("Both netname and configuration directory given, using the latter..."));
if(!identname)
asprintf(&identname, "tinc.%s", netname);
}
/* Slllluuuuuuurrrrp! */
cp
+#ifdef USE_OPENSSL
RAND_load_file("/dev/urandom", 1024);
#ifdef HAVE_SSLEAY_ADD_ALL_ALGORITHMS
read_server_config();
exit(keygen(generate_keys));
}
+#endif
if(kill_tincd)
exit(kill_other(kill_tincd));
cleanup_and_exit(1);
}
- syslog(LOG_ERR, _("Unrecoverable error"));
+ log(0, TLOG_ERROR, _("Unrecoverable error"));
cp_trace();
if(do_detach)
{
- syslog(LOG_NOTICE, _("Restarting in %d seconds!"), maxtimeout);
+ log(0, TLOG_NOTICE, _("Restarting in %d seconds!"), maxtimeout);
sleep(maxtimeout);
}
else
{
- syslog(LOG_ERR, _("Not restarting."));
+ log(0, TLOG_ERROR, _("Not restarting."));
exit(1);
}
}