X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Ftincd.c;h=74dac49b0dc7eb2b2ff6f1365c780b71b7664dfe;hp=a8ea62c682354d510fd5ec08706cadb2cb88de9d;hb=3219be5770716bdb0c8b6e9e4c674a447c5085f2;hpb=baebae274913d912d76ba1d545f337dfb945fc5c

diff --git a/src/tincd.c b/src/tincd.c
index a8ea62c6..74dac49b 100644
--- a/src/tincd.c
+++ b/src/tincd.c
@@ -19,6 +19,12 @@
 
 /*
  * $Log: tincd.c,v $
+ * Revision 1.7  2000/04/27 13:47:51  zarq
+ * Default config file name is tinc.conf, and pidfile is tinc.pid.
+ *
+ * Revision 1.6  2000/04/18 16:04:10  zarq
+ * Address for bugreports changed to tinc@nl.linux.org.
+ *
  * Revision 1.5  2000/04/17 16:23:29  zarq
  * Pass the requested size from xmalloc() and xrealloc() on to xalloc_fail_func()
  *
@@ -109,7 +115,7 @@ usage(int status)
 	     "  -t, --timeout=TIMEOUT Seconds to wait before giving a timeout.\n");
       printf("      --help            Display this help and exit.\n"
 	     "      --version         Output version information and exit.\n\n");
-      printf("Report bugs to zarq@iname.com.\n");
+      printf("Report bugs to tinc@nl.linux.org.\n");
     }
   exit(status);
 }
@@ -301,30 +307,30 @@ void make_names(void)
       if(netname)
 	{
 	  configfilename = xmalloc(strlen(netname)+18+strlen(CONFDIR));
-	  sprintf(configfilename, "%s/tinc/%s/tincd.conf", CONFDIR, netname);
+	  sprintf(configfilename, "%s/tinc/%s/tinc.conf", CONFDIR, netname);
 	}
       else
 	{
 	  configfilename = xmalloc(17+strlen(CONFDIR));
-	  sprintf(configfilename, "%s/tinc/tincd.conf", CONFDIR);
+	  sprintf(configfilename, "%s/tinc/tinc.conf", CONFDIR);
 	}
     }
   
   if(netname)
     {
       pidfilename = xmalloc(strlen(netname)+20);
-      sprintf(pidfilename, "/var/run/tincd.%s.pid", netname);
+      sprintf(pidfilename, "/var/run/tinc.%s.pid", netname);
       confbase = xmalloc(strlen(netname)+8+strlen(CONFDIR));
       sprintf(confbase, "%s/tinc/%s/", CONFDIR, netname);
       identname = xmalloc(strlen(netname)+7);
-      sprintf(identname, "tincd.%s", netname);
+      sprintf(identname, "tinc.%s", netname);
     }
   else
     {
-      pidfilename = "/var/run/tincd.pid";
+      pidfilename = "/var/run/tinc.pid";
       confbase = xmalloc(7+strlen(CONFDIR));
       sprintf(confbase, "%s/tinc/", CONFDIR);
-      identname = "tincd";
+      identname = "tinc";
     }
 }