From: Art Cancro <ajc@citadel.org>
Date: Sun, 24 Sep 2000 22:01:45 +0000 (+0000)
Subject: * ipc_c_tcp.c: don't hardcode BBSDIR path for unix domain sockets
X-Git-Tag: v7.86~7098
X-Git-Url: https://code.citadel.org/?a=commitdiff_plain;h=9a0320b64d5a08ee9193fb794fa1ff9751030a2f;p=citadel.git

* ipc_c_tcp.c: don't hardcode BBSDIR path for unix domain sockets
---

diff --git a/citadel/ChangeLog b/citadel/ChangeLog
index da6ed7212..fd4c21f7a 100644
--- a/citadel/ChangeLog
+++ b/citadel/ChangeLog
@@ -1,4 +1,7 @@
  $Log$
+ Revision 573.3  2000/09/24 22:01:45  ajc
+ * ipc_c_tcp.c: don't hardcode BBSDIR path for unix domain sockets
+
  Revision 573.2  2000/09/21 04:16:44  ajc
  * Fixed logged_in_response() so it only displays responses during Citadel
    protocol sessions.  (This was affecting POP etc.)
@@ -2060,4 +2063,3 @@ Sat Jul 11 00:20:48 EDT 1998 Nathan Bryant <bryant@cs.usm.maine.edu>
 
 Fri Jul 10 1998 Art Cancro <ajc@uncensored.citadel.org>
 	* Initial CVS import 
-
diff --git a/citadel/ipc_c_tcp.c b/citadel/ipc_c_tcp.c
index 2151c1590..9ae19f389 100644
--- a/citadel/ipc_c_tcp.c
+++ b/citadel/ipc_c_tcp.c
@@ -314,7 +314,7 @@ void attach_to_server(int argc, char **argv, char *hostbuf, char *portbuf)
 
 	/* If we're using a unix domain socket we can do a bunch of stuff */
 	if (!strcmp(cithost, UDS)) {
-		sprintf(sockpath, "%s/citadel.socket", BBSDIR);
+		sprintf(sockpath, "citadel.socket");
 		serv_sock = uds_connectsock(sockpath);
 		if (hostbuf != NULL) strcpy(hostbuf, cithost);
 		if (portbuf != NULL) strcpy(portbuf, sockpath);
diff --git a/citadel/sendcommand.c b/citadel/sendcommand.c
index b2c70005f..811775535 100644
--- a/citadel/sendcommand.c
+++ b/citadel/sendcommand.c
@@ -148,6 +148,7 @@ int main(int argc, char **argv)
 	signal(SIGTERM, cleanup);
 
 	fprintf(stderr, "sendcommand: started.  pid=%ld\n", (long) getpid());
+	fprintf(stderr, "Running from %s\n", bbs_home_directory);
 	fflush(stderr);
 	np_attach_to_server();
 	fflush(stderr);