X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Ftincd.c;h=ea2d3a7aba019c8fddc5ec359b2fccfa38722271;hp=4c494f5c608db3dd43bc43601452b2a8b6be8011;hb=6fb4a5b6be5628ece9b391b46e7858fdf5957a80;hpb=4ad1e382d6f10acf94ce59d85b80925cee7553a6

diff --git a/src/tincd.c b/src/tincd.c
index 4c494f5c..ea2d3a7a 100644
--- 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.
 
-    $Id: tincd.c,v 1.10.4.24 2000/11/03 22:31:55 zarq Exp $
+    $Id: tincd.c,v 1.10.4.27 2000/11/08 20:52:37 guus Exp $
 */
 
 #include "config.h"
@@ -35,6 +35,7 @@
 #include <openssl/rsa.h>
 #include <openssl/err.h>
 #include <string.h>
+#include <termios.h>
 
 #ifdef HAVE_SYS_IOCTL_H
 # include <sys/ioctl.h>
@@ -87,6 +88,7 @@ int write_pidfile(void);
 
 static struct option const long_options[] =
 {
+  { "config", required_argument, NULL, 'c' },
   { "kill", no_argument, NULL, 'k' },
   { "net", required_argument, NULL, 'n' },
   { "help", no_argument, &show_help, 1 },
@@ -227,7 +229,8 @@ int keygen(int bits)
 
 void memory_full(int size)
 {
-  syslog(LOG_ERR, _("Memory exhausted (last is %s:%d) (couldn't allocate %d bytes), exiting."), cp_file, cp_line, size);
+  syslog(LOG_ERR, _("Memory exhausted (couldn't allocate %d bytes), exiting."), size);
+  cp_trace();
   exit(1);
 }
 
@@ -368,6 +371,8 @@ void make_names(void)
         asprintf(&pidfilename, "/var/run/tinc.%s.pid", netname);
       if(!confbase)
         asprintf(&confbase, "%s/tinc/%s", CONFDIR, netname);
+      else
+        fprintf(stderr, _("Both netname and configuration directory given, using the latter...\n"));
       if(!identname)
         asprintf(&identname, "tinc.%s", netname);
     }