/* -*-c-*-
*
- * $Id: client.c,v 1.10 2003/05/17 10:59:19 mdw Exp $
+ * $Id: client.c,v 1.13 2003/11/29 23:49:32 mdw Exp $
*
* Client for TrIPE
*
/*----- Revision history --------------------------------------------------*
*
* $Log: client.c,v $
+ * Revision 1.13 2003/11/29 23:49:32 mdw
+ * Debianization.
+ *
+ * Revision 1.12 2003/10/15 09:29:38 mdw
+ * Cosmetic fix to changelog comment.
+ *
+ * Revision 1.11 2003/07/13 11:19:49 mdw
+ * Incompatible protocol fix! Include message type code under MAC tag to
+ * prevent cut-and-paste from key-exchange messages to general packet
+ * transport.
+ *
* Revision 1.10 2003/05/17 10:59:19 mdw
* Put a newline in the pidfile.
*
-u, --usage Show brief usage message.\n\
\n\
-D, --daemon Become a background task after connecting.\n\
--d, --directory=DIR Select current directory [default /var/lib/tripe]\n\
--a, --admin-socket=FILE Select socket to connect to.\n\
+-d, --directory=DIR Select current directory [default " CONFIGDIR "].\n\
+-a, --admin-socket=FILE Select socket to connect to
+ [default " SOCKETDIR "/tripesock].\n\
-P, --pidfile=FILE Write process-id to FILE.\n\
\n\
-s, --spawn Start server rather than connecting.\n\
int main(int argc, char *argv[])
{
- const char *dir = "/var/lib/tripe";
- const char *sock = "tripesock";
+ const char *dir = CONFIGDIR;
+ const char *sock = SOCKETDIR "/tripesock";
const char *spawnpath = "tripe";
string_v spawnopts = DA_INIT;
char *p;
close(pfd[0]);
if (logfp)
fclose(logfp);
+ if (pidfp)
+ fclose(pidfp);
closelog();
if (f & f_daemon)
u_detach();