projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Don't link in libdl.
[tinc]
/
src
/
tincd.c
diff --git
a/src/tincd.c
b/src/tincd.c
index
a8ea62c
..
74dac49
100644
(file)
--- a/
src/tincd.c
+++ b/
src/tincd.c
@@
-19,6
+19,12
@@
/*
* $Log: tincd.c,v $
/*
* $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()
*
* 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");
" -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);
}
}
exit(status);
}
@@
-301,30
+307,30
@@
void make_names(void)
if(netname)
{
configfilename = xmalloc(strlen(netname)+18+strlen(CONFDIR));
if(netname)
{
configfilename = xmalloc(strlen(netname)+18+strlen(CONFDIR));
- sprintf(configfilename, "%s/tinc/%s/tinc
d
.conf", CONFDIR, netname);
+ sprintf(configfilename, "%s/tinc/%s/tinc.conf", CONFDIR, netname);
}
else
{
configfilename = xmalloc(17+strlen(CONFDIR));
}
else
{
configfilename = xmalloc(17+strlen(CONFDIR));
- sprintf(configfilename, "%s/tinc/tinc
d
.conf", CONFDIR);
+ sprintf(configfilename, "%s/tinc/tinc.conf", CONFDIR);
}
}
if(netname)
{
pidfilename = xmalloc(strlen(netname)+20);
}
}
if(netname)
{
pidfilename = xmalloc(strlen(netname)+20);
- sprintf(pidfilename, "/var/run/tinc
d
.%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);
confbase = xmalloc(strlen(netname)+8+strlen(CONFDIR));
sprintf(confbase, "%s/tinc/%s/", CONFDIR, netname);
identname = xmalloc(strlen(netname)+7);
- sprintf(identname, "tinc
d
.%s", netname);
+ sprintf(identname, "tinc.%s", netname);
}
else
{
}
else
{
- pidfilename = "/var/run/tinc
d
.pid";
+ pidfilename = "/var/run/tinc.pid";
confbase = xmalloc(7+strlen(CONFDIR));
sprintf(confbase, "%s/tinc/", CONFDIR);
confbase = xmalloc(7+strlen(CONFDIR));
sprintf(confbase, "%s/tinc/", CONFDIR);
- identname = "tinc
d
";
+ identname = "tinc";
}
}
}
}